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.158 by root, Mon Apr 24 02:41:48 2006 UTC vs.
Revision 1.258 by root, Tue May 30 02:55:45 2006 UTC

1package CFClient::UI; 1package CFClient::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util (); 6use Scalar::Util ();
6use List::Util (); 7use List::Util ();
7 8
8use CFClient; 9use CFClient;
10use CFClient::Texture;
9 11
10our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
11 13
14our $LAYOUT;
12our $ROOT; 15our $ROOT;
13our $TOOLTIP; 16our $TOOLTIP;
14our $BUTTON_STATE; 17our $BUTTON_STATE;
15 18
19our %WIDGET; # all widgets, weak-referenced
20
21sub get_layout {
22 my $layout;
23
24 for (grep { $_->{name} } values %WIDGET) {
25 my $win = $layout->{$_->{name}} = { };
26
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
31
32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
36}
37
38sub set_layout {
39 my ($layout) = @_;
40
41 $LAYOUT = $layout;
42}
43
16sub check_tooltip { 44sub check_tooltip {
17 if (!$GRAB) { 45 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 46 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (exists $widget->{tooltip}) { 47 if (length $widget->{tooltip}) {
20 48
21 if ($TOOLTIP->{owner} != $widget) { 49 if ($TOOLTIP->{owner} != $widget) {
50 $TOOLTIP->hide;
51
22 $TOOLTIP->{owner} = $widget; 52 $TOOLTIP->{owner} = $widget;
23 53
24 my $tip = $widget->{tooltip}; 54 my $tip = $widget->{tooltip};
25 55
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 56 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 57
28 $TOOLTIP->set_text ($widget->{tooltip}); 58 $TOOLTIP->set_tooltip_from ($widget);
29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
30 $TOOLTIP->show; 59 $TOOLTIP->show;
31 } 60 }
32 61
33 return; 62 return;
34 } 63 }
… …
39 delete $TOOLTIP->{owner}; 68 delete $TOOLTIP->{owner};
40} 69}
41 70
42# class methods for events 71# class methods for events
43sub feed_sdl_key_down_event { 72sub feed_sdl_key_down_event {
44 $FOCUS->key_down ($_[0]) if $FOCUS; 73 $FOCUS->emit (key_down => $_[0])
74 if $FOCUS;
45} 75}
46 76
47sub feed_sdl_key_up_event { 77sub feed_sdl_key_up_event {
48 $FOCUS->key_up ($_[0]) if $FOCUS; 78 $FOCUS->emit (key_up => $_[0])
79 if $FOCUS;
49} 80}
50 81
51sub feed_sdl_button_down_event { 82sub feed_sdl_button_down_event {
52 my ($ev) = @_; 83 my ($ev) = @_;
53 my ($x, $y) = ($ev->{x}, $ev->{y}); 84 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
61 check_tooltip; 92 check_tooltip;
62 } 93 }
63 94
64 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 95 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
65 96
66 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 97 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
98 if $GRAB;
67} 99}
68 100
69sub feed_sdl_button_up_event { 101sub feed_sdl_button_up_event {
70 my ($ev) = @_; 102 my ($ev) = @_;
71 my ($x, $y) = ($ev->{x}, $ev->{y}); 103 my ($x, $y) = ($ev->{x}, $ev->{y});
72 104
73 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 105 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
74 106
75 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 107 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
76 108
77 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 109 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
110 if $GRAB;
78 111
79 if (!$BUTTON_STATE) { 112 if (!$BUTTON_STATE) {
80 my $grab = $GRAB; undef $GRAB; 113 my $grab = $GRAB; undef $GRAB;
81 $grab->update if $grab; 114 $grab->update if $grab;
82 $GRAB->update if $GRAB; 115 $GRAB->update if $GRAB;
… …
98 $HOVER->update if $HOVER && $HOVER->{can_hover}; 131 $HOVER->update if $HOVER && $HOVER->{can_hover};
99 132
100 check_tooltip; 133 check_tooltip;
101 } 134 }
102 135
103 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 136 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
137 if $HOVER;
104} 138}
105 139
106# convert position array to integers 140# convert position array to integers
107sub harmonize { 141sub harmonize {
108 my ($vals) = @_; 142 my ($vals) = @_;
… …
114 $rem += $_ - $i; 148 $rem += $_ - $i;
115 $_ = $i; 149 $_ = $i;
116 } 150 }
117} 151}
118 152
153sub full_refresh {
154 # make a copy, otherwise for complains about freed values.
155 my @widgets = values %WIDGET;
156
157 $_->update
158 for @widgets;
159}
160
161sub reconfigure_widgets {
162 # make a copy, otherwise C<for> complains about freed values.
163 my @widgets = values %WIDGET;
164
165 $_->reconfigure
166 for @widgets;
167}
168
169# call when resolution changes etc.
170sub rescale_widgets {
171 my ($sx, $sy) = @_;
172
173 for my $widget (values %WIDGET) {
174 if ($widget->{is_toplevel}) {
175 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
176 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
177
178 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
179 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
180 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
181 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
182 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
183 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
184
185 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
186 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
187
188 }
189 }
190
191 reconfigure_widgets;
192}
193
119############################################################################# 194#############################################################################
120 195
121package CFClient::UI::Base; 196package CFClient::UI::Base;
122 197
123use strict; 198use strict;
… …
126 201
127sub new { 202sub new {
128 my $class = shift; 203 my $class = shift;
129 204
130 my $self = bless { 205 my $self = bless {
131 x => 0, 206 x => "center",
132 y => 0, 207 y => "center",
133 z => 0, 208 z => 0,
209 w => undef,
210 h => undef,
134 can_events => 1, 211 can_events => 1,
135 @_ 212 @_
136 }, $class; 213 }, $class;
137 214
215 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
216
138 for (keys %$self) { 217 for (keys %$self) {
139 if (/^connect_(.*)$/) { 218 if (/^on_(.*)$/) {
140 $self->connect ($1 => delete $self->{$_}); 219 $self->connect ($1 => delete $self->{$_});
141 } 220 }
142 } 221 }
143 222
223 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
224 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{w} if exists $layout->{x};
225 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{h} if exists $layout->{y};
226 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{w} if exists $layout->{w};
227 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{h} if exists $layout->{h};
228
229 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
230 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
231
232 $self->show if $layout->{show};
233 }
234
144 $self 235 $self
145} 236}
146 237
238sub destroy {
239 my ($self) = @_;
240
241 $self->hide;
242 %$self = ();
243}
244
147sub show { 245sub show {
148 my ($self) = @_; 246 my ($self) = @_;
149 247
150 return if $self->{parent}; 248 return if $self->{parent};
151 249
152 $CFClient::UI::ROOT->add ($self); 250 $CFClient::UI::ROOT->add ($self);
153} 251}
154 252
253sub set_visible {
254 my ($self) = @_;
255
256 return if $self->{visible};
257
258 $self->{root} = $self->{parent}{root};
259 $self->{visible} = $self->{parent}{visible} + 1;
260
261 $self->emit (visibility_change => 1);
262
263 $self->realloc if !exists $self->{req_w};
264
265 $_->set_visible for $self->children;
266}
267
268sub set_invisible {
269 my ($self) = @_;
270
271 return unless $self->{visible};
272
273 $_->set_invisible for $self->children;
274
275 delete $self->{root};
276 delete $self->{visible};
277
278 undef $GRAB if $GRAB == $self;
279 undef $HOVER if $HOVER == $self;
280
281 CFClient::UI::check_tooltip
282 if $TOOLTIP->{owner} == $self;
283
284 $self->focus_out;
285
286 $self->emit (visibility_change => 0);
287}
288
289sub set_visibility {
290 my ($self, $visible) = @_;
291
292 return if $self->{visible} == $visible;
293
294 $visible ? $self->hide
295 : $self->show;
296}
297
298sub toggle_visibility {
299 my ($self) = @_;
300
301 $self->{visible}
302 ? $self->hide
303 : $self->show;
304}
305
155sub hide { 306sub hide {
156 my ($self) = @_; 307 my ($self) = @_;
157 308
158 return unless $self->{parent}; 309 $self->set_invisible;
159 310
160 $self->{parent}->remove ($self); 311 $self->{parent}->remove ($self)
312 if $self->{parent};
161} 313}
162 314
163sub move { 315sub move_abs {
164 my ($self, $x, $y, $z) = @_; 316 my ($self, $x, $y, $z) = @_;
165 317
166 $self->{x} = int $x; 318 $self->{x} = List::Util::max 0, int $x;
167 $self->{y} = int $y; 319 $self->{y} = List::Util::max 0, int $y;
168 $self->{z} = $z if defined $z; 320 $self->{z} = $z if defined $z;
169 321
170 $self->update; 322 $self->update;
171} 323}
172 324
173sub set_size { 325sub set_size {
174 my ($self, $w, $h) = @_; 326 my ($self, $w, $h) = @_;
175 327
176 $self->{user_w} = $w; 328 $self->{force_w} = $w;
177 $self->{user_h} = $h; 329 $self->{force_h} = $h;
178 330
179 $self->check_size; 331 $self->realloc;
180} 332}
181 333
182sub size_request { 334sub size_request {
183 require Carp; 335 require Carp;
184 Carp::confess "size_request is abstract"; 336 Carp::confess "size_request is abstract";
… …
186 338
187sub configure { 339sub configure {
188 my ($self, $x, $y, $w, $h) = @_; 340 my ($self, $x, $y, $w, $h) = @_;
189 341
190 if ($self->{aspect}) { 342 if ($self->{aspect}) {
343 my ($ow, $oh) = ($w, $h);
344
191 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 345 $w = List::Util::min $w, int $h * $self->{aspect};
192 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 346 $h = List::Util::min $h, int $w / $self->{aspect};
193 347
194 # use alignment to adjust x, y 348 # use alignment to adjust x, y
195 349
196 $x += int +($w - $w2) * 0.5; 350 $x += int 0.5 * ($ow - $w);
197 $y += int +($h - $h2) * 0.5; 351 $y += int 0.5 * ($oh - $h);
198
199 ($w, $h) = ($w2, $h2);
200 } 352 }
201 353
202 if ($self->{x} != $x || $self->{y} != $y) { 354 if ($self->{x} ne $x || $self->{y} ne $y) {
203 $self->{x} = $x; 355 $self->{x} = $x;
204 $self->{y} = $y; 356 $self->{y} = $y;
205 $self->update; 357 $self->update;
206 } 358 }
207 359
208 if ($self->{w} != $w || $self->{h} != $h) { 360 if ($self->{w} != $w || $self->{h} != $h) {
209 $self->{w} = $w; 361 return unless $self->{visible};
210 $self->{h} = $h;
211 362
212 $self->size_allocate ($w, $h); 363 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
213 $self->update;
214 } 364 }
215} 365}
216 366
217sub size_allocate { 367sub size_allocate {
218 # nothing to be done 368 # nothing to be done
219} 369}
220 370
371sub children {
372}
373
221sub set_max_size { 374sub set_max_size {
222 my ($self, $w, $h) = @_; 375 my ($self, $w, $h) = @_;
223 376
224 delete $self->{max_w}; $self->{max_w} = $w if $w; 377 delete $self->{max_w}; $self->{max_w} = $w if $w;
225 delete $self->{max_h}; $self->{max_h} = $h if $h; 378 delete $self->{max_h}; $self->{max_h} = $h if $h;
226} 379}
227 380
228# return top left coordinates 381sub set_tooltip {
229sub _topleft {
230 my ($self, $x, $y) = @_; 382 my ($self, $tooltip) = @_;
231 383
232 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 384 $tooltip =~ s/^\s+//;
385 $tooltip =~ s/\s+$//;
386
387 return if $self->{tooltip} eq $tooltip;
388
389 $self->{tooltip} = $tooltip;
390
391 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
392 delete $CFClient::UI::TOOLTIP->{owner};
393 CFClient::UI::check_tooltip;
394 }
233} 395}
234 396
235# translate global coordinates to local coordinate system 397# translate global coordinates to local coordinate system
236sub coord2local { 398sub coord2local {
237 my ($self, $x, $y) = @_; 399 my ($self, $x, $y) = @_;
238 400
239 my ($X, $Y) = $self->_topleft; 401 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
240 ($x - $X, $y - $Y)
241} 402}
242 403
243# translate local coordinates to global coordinate system 404# translate local coordinates to global coordinate system
244sub coord2global { 405sub coord2global {
245 my ($self, $x, $y) = @_; 406 my ($self, $x, $y) = @_;
246 407
247 my ($X, $Y) = $self->_topleft; 408 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
248 ($x + $X, $y + $Y)
249} 409}
250 410
251sub focus_in { 411sub focus_in {
252 my ($self) = @_; 412 my ($self) = @_;
253 413
254 return if $FOCUS == $self; 414 return if $FOCUS == $self;
255 return unless $self->{can_focus}; 415 return unless $self->{can_focus};
256 416
257 my $focus = $FOCUS; $FOCUS = $self; 417 my $focus = $FOCUS; $FOCUS = $self;
258 418
259 $self->emit (focus_in => $focus); 419 $self->_emit (focus_in => $focus);
260 420
261 $focus->update if $focus; 421 $focus->update if $focus;
262 $FOCUS->update; 422 $FOCUS->update;
263} 423}
264 424
… …
267 427
268 return unless $FOCUS == $self; 428 return unless $FOCUS == $self;
269 429
270 my $focus = $FOCUS; undef $FOCUS; 430 my $focus = $FOCUS; undef $FOCUS;
271 431
272 $self->emit (focus_out => $focus); 432 $self->_emit (focus_out => $focus);
273 433
274 $focus->update if $focus; #? 434 $focus->update if $focus; #?
435
436 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
437 unless $FOCUS;
275} 438}
276 439
277sub mouse_motion { } 440sub mouse_motion { }
278sub button_up { } 441sub button_up { }
279sub key_down { } 442sub key_down { }
280sub key_up { } 443sub key_up { }
281 444
282sub button_down { 445sub button_down {
283 my ($self, $ev, $x, $y) = @_; 446 my ($self, $ev, $x, $y) = @_;
284 447
285 $self->focus_in; 448 $self->focus_in;
… …
288sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 451sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
289sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 452sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
290sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 453sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
291sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 454sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
292sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 455sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
456
457sub find_widget {
458 my ($self, $x, $y) = @_;
459
460 return () unless $self->{can_events};
461
462 return $self
463 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
464 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
465
466 ()
467}
468
469sub set_parent {
470 my ($self, $parent) = @_;
471
472 Scalar::Util::weaken ($self->{parent} = $parent);
473 $self->set_visible if $parent->{visible};
474}
475
476sub connect {
477 my ($self, $signal, $cb) = @_;
478
479 push @{ $self->{signal_cb}{$signal} }, $cb;
480}
481
482sub _emit {
483 my ($self, $signal, @args) = @_;
484
485 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
486}
487
488sub emit {
489 my ($self, $signal, @args) = @_;
490
491 $self->_emit ($signal, @args)
492 || $self->$signal (@args);
493}
494
495sub visibility_change {
496 #my ($self, $visible) = @_;
497}
498
499sub realloc {
500 my ($self) = @_;
501
502 if ($self->{visible}) {
503 return if $self->{root}{realloc}{$self};
504
505 $self->{root}{realloc}{$self} = $self;
506 $self->{root}->update;
507 } else {
508 delete $self->{req_w};
509 }
510}
511
512sub update {
513 my ($self) = @_;
514
515 $self->{parent}->update
516 if $self->{parent};
517}
518
519sub reconfigure {
520 my ($self) = @_;
521
522 $self->realloc;
523 $self->update;
524}
293 525
294sub draw { 526sub draw {
295 my ($self) = @_; 527 my ($self) = @_;
296 528
297 return unless $self->{h} && $self->{w}; 529 return unless $self->{h} && $self->{w};
… …
313 glVertex $x + $self->{w}, $y + $self->{h}; 545 glVertex $x + $self->{w}, $y + $self->{h};
314 glVertex $x , $y + $self->{h}; 546 glVertex $x , $y + $self->{h};
315 glEnd; 547 glEnd;
316 glDisable GL_BLEND; 548 glDisable GL_BLEND;
317 } 549 }
550
551 if ($ENV{CFPLUS_DEBUG}) {
552 glPushMatrix;
553 glColor 1, 1, 0, 1;
554 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
555 glBegin GL_LINE_LOOP;
556 glVertex 0 , 0;
557 glVertex $self->{w} - 1, 0;
558 glVertex $self->{w} - 1, $self->{h} - 1;
559 glVertex 0 , $self->{h} - 1;
560 glEnd;
561 glPopMatrix;
562 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
563 }
318} 564}
319 565
320sub _draw { 566sub _draw {
321 my ($self) = @_; 567 my ($self) = @_;
322 568
323 warn "no draw defined for $self\n"; 569 warn "no draw defined for $self\n";
324} 570}
325 571
326sub find_widget {
327 my ($self, $x, $y) = @_;
328
329 return () unless $self->{can_events};
330
331 return $self
332 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
333 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
334
335 ()
336}
337
338sub set_parent {
339 my ($self, $parent) = @_;
340
341 Scalar::Util::weaken ($self->{parent} = $parent);
342}
343
344sub check_size {
345 my ($self) = @_;
346
347 $self->{parent}
348 or return 1;
349
350 my ($w, $h) = $self->{user_w} && $self->{user_h}
351 ? @$self{qw(user_w user_h)}
352 : $self->size_request;
353
354 if ($w != $self->{req_w} || $h != $self->{req_h}) {
355 $self->{req_w} = $w;
356 $self->{req_h} = $h;
357
358 $self->{parent}->check_size
359 or $self->size_allocate (
360 (List::Util::max $self->{w}, $w),
361 (List::Util::max $self->{h}, $h),
362 );
363
364 1
365 } else {
366 0
367 }
368}
369
370sub update {
371 my ($self) = @_;
372
373 $self->{parent}->update
374 if $self->{parent};
375}
376
377sub connect {
378 my ($self, $signal, $cb) = @_;
379
380 push @{ $self->{signal_cb}{$signal} }, $cb;
381}
382
383sub emit {
384 my ($self, $signal, @args) = @_;
385
386 for my $cb (@{$self->{signal_cb}{$signal} || []}) {
387 $cb->($self, @args);
388 }
389}
390
391sub DESTROY { 572sub DESTROY {
392 my ($self) = @_; 573 my ($self) = @_;
393 574
575 delete $WIDGET{$self+0};
394 #$self->deactivate; 576 #$self->deactivate;
395} 577}
396 578
397############################################################################# 579#############################################################################
398 580
… …
407 my $class = shift; 589 my $class = shift;
408 590
409 # range [value, low, high, page] 591 # range [value, low, high, page]
410 592
411 $class->SUPER::new ( 593 $class->SUPER::new (
412 bg => [0, 0, 0, 0.2], 594 #bg => [0, 0, 0, 0.2],
413 active_bg => [1, 1, 1, 0.5], 595 #active_bg => [1, 1, 1, 0.5],
414 @_ 596 @_
415 ) 597 )
416} 598}
417 599
418sub _draw { 600sub _draw {
419 my ($self) = @_; 601 my ($self) = @_;
420 602
603 my $color = $FOCUS == $self && $self->{active_bg}
604 ? $self->{active_bg}
605 : $self->{bg};
606
607 if ($color && (@$color < 4 || $color->[3])) {
421 my ($w, $h) = @$self{qw(w h)}; 608 my ($w, $h) = @$self{qw(w h)};
422 609
423 glEnable GL_BLEND; 610 glEnable GL_BLEND;
424 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 611 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
425 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 612 glColor @$color;
426 613
427 glBegin GL_QUADS; 614 glBegin GL_QUADS;
428 glVertex 0 , 0; 615 glVertex 0 , 0;
429 glVertex 0 , $h; 616 glVertex 0 , $h;
430 glVertex $w, $h; 617 glVertex $w, $h;
431 glVertex $w, 0; 618 glVertex $w, 0;
432 glEnd; 619 glEnd;
433 620
434 glDisable GL_BLEND; 621 glDisable GL_BLEND;
622 }
435} 623}
436 624
437############################################################################# 625#############################################################################
438 626
439package CFClient::UI::Empty; 627package CFClient::UI::Empty;
… …
444 my ($class, %arg) = @_; 632 my ($class, %arg) = @_;
445 $class->SUPER::new (can_events => 0, %arg); 633 $class->SUPER::new (can_events => 0, %arg);
446} 634}
447 635
448sub size_request { 636sub size_request {
449 (0, 0) 637 my ($self) = @_;
638
639 ($self->{w} + 0, $self->{h} + 0)
450} 640}
451 641
452sub draw { } 642sub draw { }
453 643
454############################################################################# 644#############################################################################
… …
460sub new { 650sub new {
461 my ($class, %arg) = @_; 651 my ($class, %arg) = @_;
462 652
463 my $children = delete $arg{children} || []; 653 my $children = delete $arg{children} || [];
464 654
465 my $self = $class->SUPER::new (children => [], can_events => 0, %arg); 655 my $self = $class->SUPER::new (
656 children => [],
657 can_events => 0,
658 %arg,
659 );
466 $self->add ($_) for @$children; 660 $self->add ($_) for @$children;
467 661
468 $self 662 $self
469} 663}
470 664
471sub add { 665sub add {
472 my ($self, $child) = @_; 666 my ($self, @widgets) = @_;
473 667
474 $child->set_parent ($self); 668 $_->set_parent ($self)
669 for @widgets;
475 670
476 use sort 'stable'; 671 use sort 'stable';
477 672
478 $self->{children} = [ 673 $self->{children} = [
479 sort { $a->{z} <=> $b->{z} } 674 sort { $a->{z} <=> $b->{z} }
480 @{$self->{children}}, $child 675 @{$self->{children}}, @widgets
481 ]; 676 ];
482 677
483 $child->check_size; 678 $self->realloc;
679}
680
681sub children {
682 @{ $_[0]{children} }
484} 683}
485 684
486sub remove { 685sub remove {
487 my ($self, $child) = @_; 686 my ($self, $child) = @_;
488 687
489 delete $child->{parent}; 688 delete $child->{parent};
689 $child->hide;
490 690
491 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 691 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
492 692
493 $self->check_size; 693 $self->realloc;
494 $self->update; 694}
695
696sub clear {
697 my ($self) = @_;
698
699 my $children = delete $self->{children};
700 $self->{children} = [];
701
702 for (@$children) {
703 delete $_->{parent};
704 $_->hide;
705 }
706
707 $self->realloc;
495} 708}
496 709
497sub find_widget { 710sub find_widget {
498 my ($self, $x, $y) = @_; 711 my ($self, $x, $y) = @_;
499 712
… …
552sub size_request { 765sub size_request {
553 $_[0]{children}[0]->size_request 766 $_[0]{children}[0]->size_request
554} 767}
555 768
556sub size_allocate { 769sub size_allocate {
557 my ($self, $w, $h) = @_; 770 my ($self, $w, $h, $changed) = @_;
558 771
559 $self->{children}[0]->configure (0, 0, $w, $h); 772 $self->{children}[0]->configure (0, 0, $w, $h);
560} 773}
561 774
562############################################################################# 775#############################################################################
… …
574} 787}
575 788
576sub update { 789sub update {
577 my ($self) = @_; 790 my ($self) = @_;
578 791
579 # we want to do this delayed... 792 $ROOT->on_post_alloc ($self => sub { $self->render_child });
580 $self->render_chld;
581 $self->SUPER::update; 793 $self->SUPER::update;
582} 794}
583 795
796sub size_allocate {
797 my ($self, $w, $h, $changed) = @_;
798
799 $self->SUPER::size_allocate ($w, $h, $changed);
800 $self->update
801 if $changed;
802}
803
804sub _render {
805 $_[0]{children}[0]->draw;
806}
807
584sub render_chld { 808sub render_child {
585 my ($self) = @_; 809 my ($self) = @_;
586 810
587 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 811 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
588 glClearColor 0, 0, 0, 1; 812 glClearColor 0, 0, 0, 0;
589 glClear GL_COLOR_BUFFER_BIT; 813 glClear GL_COLOR_BUFFER_BIT;
590 $self->child->draw; 814
815 $self->_render;
591 }; 816 };
592}
593
594sub size_allocate {
595 my ($self, $w, $h) = @_;
596
597 $self->child->configure (0, 0, $w, $h);
598
599 $self->render_chld;
600} 817}
601 818
602sub _draw { 819sub _draw {
603 my ($self) = @_; 820 my ($self) = @_;
604 821
605 my ($w, $h) = ($self->w, $self->h); 822 my ($w, $h) = ($self->w, $self->h);
606 823
607 my $tex = $self->{texture} 824 my $tex = $self->{texture}
608 or return; 825 or return;
609 826
610 glEnable GL_BLEND;
611 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
612 glEnable GL_TEXTURE_2D; 827 glEnable GL_TEXTURE_2D;
613 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 828 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
829 glColor 1, 1, 1, 1;
614 830
615 $tex->draw_quad (0, 0, $w, $h); 831 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
616 832
617 glDisable GL_BLEND;
618 glDisable GL_TEXTURE_2D; 833 glDisable GL_TEXTURE_2D;
619} 834}
620 835
621############################################################################# 836#############################################################################
622 837
623package CFClient::UI::ViewPort; 838package CFClient::UI::ViewPort;
624 839
625our @ISA = CFClient::UI::Window::; 840our @ISA = CFClient::UI::Window::;
626
627sub new { die }
628
629sub size_request {
630 my ($self) = @_;
631
632 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
633 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
634
635 @$self{qw(child_w child_h)}
636}
637
638sub _draw {
639 my ($self) = @_;
640
641 $self->{children}[1]->draw;
642}
643
644
645#############################################################################
646
647package CFClient::UI::Frame;
648
649our @ISA = CFClient::UI::Bin::;
650
651use CFClient::OpenGL;
652 841
653sub new { 842sub new {
654 my $class = shift; 843 my $class = shift;
655 844
656 my $self = $class->SUPER::new ( 845 $class->SUPER::new (
657 bg => [1, 1, 1, 1], 846 scroll_x => 0,
658 border_bg => [1, 1, 1, 1], 847 scroll_y => 1,
659 border => 0.8,
660 @_ 848 @_,
661 ); 849 )
662
663 $self
664} 850}
665 851
666sub _draw { 852sub size_request {
853 my ($self) = @_;
854
855 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
856
857 $w = 10 if $self->{scroll_x};
858 $h = 10 if $self->{scroll_y};
859
860 ($w, $h)
861}
862
863sub size_allocate {
864 my ($self, $w, $h, $changed) = @_;
865
866 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
867 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
868
869 $self->child->configure (0, 0, $w, $h);
870 $self->update;
871}
872
873sub set_offset {
667 my ($self) = @_; 874 my ($self, $x, $y) = @_;
668 875
669 my ($w, $h) = ($self->{w}, $self->{h}); 876 $self->{view_x} = int $x;
877 $self->{view_y} = int $y;
670 878
671 glEnable GL_BLEND; 879 $self->update;
672 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 880}
673 glEnable GL_TEXTURE_2D;
674 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
675 881
676# glBegin GL_QUADS; 882# hmm, this does not work for topleft of $self... but we should not ask for that
677# glColor 0, 0, 0, 0; 883sub coord2local {
678# glVertex 0 , 0; 884 my ($self, $x, $y) = @_;
679# glVertex 0 , $h;
680# glVertex $w, $h;
681# glVertex $w, 0;
682# glEnd;
683 885
886 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
887}
684 888
685 $self->child->draw; 889sub coord2global {
686 glDisable GL_BLEND; 890 my ($self, $x, $y) = @_;
687 glDisable GL_TEXTURE_2D; 891
892 $x = List::Util::min $self->{w}, $x - $self->{view_x};
893 $y = List::Util::min $self->{h}, $y - $self->{view_y};
894
895 $self->SUPER::coord2global ($x, $y)
896}
897
898sub find_widget {
899 my ($self, $x, $y) = @_;
900
901 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
902 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
903 ) {
904 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
905 } else {
906 $self->CFClient::UI::Base::find_widget ($x, $y)
907 }
908}
909
910sub _render {
911 my ($self) = @_;
912
913 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
914
915 $self->SUPER::_render;
688} 916}
689 917
690############################################################################# 918#############################################################################
691 919
692package CFClient::UI::FancyFrame; 920package CFClient::UI::ScrolledWindow;
693 921
694our @ISA = CFClient::UI::Bin::; 922our @ISA = CFClient::UI::HBox::;
695
696use CFClient::OpenGL;
697
698my @tex =
699 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
700 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
701 923
702sub new { 924sub new {
703 my $class = shift; 925 my $class = shift;
704 926
705 # TODO: user_x, user_y, overwrite moveto? 927 my $self;
928
929 my $slider = new CFClient::UI::Slider
930 vertical => 1,
931 range => [0, 0, 1, 0.01], # HACK fix
932 on_changed => sub {
933 $self->{vp}->set_offset (0, $_[1]);
934 },
935 ;
936
937 $self = $class->SUPER::new (
938 vp => (new CFClient::UI::ViewPort expand => 1),
939 slider => $slider,
940 @_,
941 );
942
943 $self->{vp}->add ($self->{scrolled});
944 $self->add ($self->{vp});
945 $self->add ($self->{slider});
946
947 $self
948}
949
950sub update {
951 my ($self) = @_;
952
953 $self->SUPER::update;
954
955 # todo: overwrite size_allocate of child
956 my $child = $self->{vp}->child;
957 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
958}
959
960sub size_allocate {
961 my ($self, $w, $h, $changed) = @_;
962
963 $self->SUPER::size_allocate ($w, $h, $changed);
964
965 my $child = $self->{vp}->child;
966 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
967}
968
969#TODO# update range on size_allocate depending on child
970# update viewport offset on scroll
971
972#############################################################################
973
974package CFClient::UI::Frame;
975
976our @ISA = CFClient::UI::Bin::;
977
978use CFClient::OpenGL;
979
980sub new {
981 my $class = shift;
982
983 $class->SUPER::new (
984 bg => undef,
985 @_,
986 )
987}
988
989sub _draw {
990 my ($self) = @_;
991
992 if ($self->{bg}) {
993 my ($w, $h) = @$self{qw(w h)};
994
995 glEnable GL_BLEND;
996 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
997 glColor @{ $self->{bg} };
998
999 glBegin GL_QUADS;
1000 glVertex 0 , 0;
1001 glVertex 0 , $h;
1002 glVertex $w, $h;
1003 glVertex $w, 0;
1004 glEnd;
1005
1006 glDisable GL_BLEND;
1007 }
1008
1009 $self->SUPER::_draw;
1010}
1011
1012#############################################################################
1013
1014package CFClient::UI::FancyFrame;
1015
1016our @ISA = CFClient::UI::Bin::;
1017
1018use CFClient::OpenGL;
1019
1020my $bg =
1021 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1022 mipmap => 1, wrap => 1;
1023
1024my @border =
1025 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1026 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1027
1028sub new {
1029 my $class = shift;
706 1030
707 my $self = $class->SUPER::new ( 1031 my $self = $class->SUPER::new (
708 bg => [1, 1, 1, 1], 1032 bg => [1, 1, 1, 1],
709 border_bg => [1, 1, 1, 1], 1033 border_bg => [1, 1, 1, 1],
710 border => 0.8, 1034 border => 0.6,
711 can_events => 1, 1035 can_events => 1,
1036 min_w => 16,
1037 min_h => 16,
712 @_ 1038 @_
713 ); 1039 );
714 1040
715 $self->{title} &&= new CFClient::UI::Label 1041 $self->{title} &&= new CFClient::UI::Label
716 align => 0, 1042 align => 0,
717 valign => 1, 1043 valign => 1,
718 text => $self->{title}, 1044 text => $self->{title},
719 fontsize => 1; 1045 fontsize => $self->{border};
720 1046
721 $self 1047 $self
722} 1048}
723 1049
724sub border { 1050sub border {
… …
735 $h + $self->border * 2, 1061 $h + $self->border * 2,
736 ) 1062 )
737} 1063}
738 1064
739sub size_allocate { 1065sub size_allocate {
740 my ($self, $w, $h) = @_; 1066 my ($self, $w, $h, $changed) = @_;
1067
1068 return unless $changed;
741 1069
742 $h -= List::Util::max 0, $self->border * 2; 1070 $h -= List::Util::max 0, $self->border * 2;
743 $w -= List::Util::max 0, $self->border * 2; 1071 $w -= List::Util::max 0, $self->border * 2;
744 1072
745 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 1073 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
746 if $self->{title}; 1074 if $self->{title};
747 1075
748 $self->child->configure ($self->border, $self->border, $w, $h); 1076 $self->child->configure ($self->border, $self->border, $w, $h);
749} 1077}
750 1078
751sub button_down { 1079sub button_down {
752 my ($self, $ev, $x, $y) = @_; 1080 my ($self, $ev, $x, $y) = @_;
753 1081
1082 my ($w, $h) = @$self{qw(w h)};
754 my $border = $self->border; 1083 my $border = $self->border;
755 1084
756 if ($x < $self->{w} && $x >= $self->{w} - $border 1085 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
757 && $y < $self->{h} && $y >= $self->{h} - $border) { 1086 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
758 1087
1088 if ($lr & $td) {
1089 my ($wx, $wy) = ($self->{x}, $self->{y});
759 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1090 my ($ox, $oy) = ($ev->{x}, $ev->{y});
760 my ($bw, $bh) = ($self->{w}, $self->{h}); 1091 my ($bw, $bh) = ($self->{w}, $self->{h});
761 1092
1093 my $mx = $x < $border;
1094 my $my = $y < $border;
1095
762 $self->{motion} = sub { 1096 $self->{motion} = sub {
763 my ($ev, $x, $y) = @_; 1097 my ($ev, $x, $y) = @_;
764 1098
765 ($x, $y) = ($ev->{x}, $ev->{y}); 1099 my $dx = $ev->{x} - $ox;
1100 my $dy = $ev->{y} - $oy;
766 1101
767 $self->{user_w} = $bw + $x - $ox; 1102 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
768 $self->{user_h} = $bh + $y - $oy; 1103 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
769 $self->check_size; 1104
1105 $self->realloc;
1106 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
770 }; 1107 };
771 1108
772 } elsif ($x >= 0 && $x < $self->{w} 1109 } elsif ($lr ^ $td) {
773 && $y >= 0 && $y < $border) {
774
775 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1110 my ($ox, $oy) = ($ev->{x}, $ev->{y});
776 my ($bx, $by) = ($self->{x}, $self->{y}); 1111 my ($bx, $by) = ($self->{x}, $self->{y});
777 1112
778 $self->{motion} = sub { 1113 $self->{motion} = sub {
779 my ($ev, $x, $y) = @_; 1114 my ($ev, $x, $y) = @_;
780 1115
781 ($x, $y) = ($ev->{x}, $ev->{y}); 1116 ($x, $y) = ($ev->{x}, $ev->{y});
782 1117
783 $self->move ($bx + $x - $ox, $by + $y - $oy); 1118 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
784 $self->update;
785 }; 1119 };
786 } 1120 }
787} 1121}
788 1122
789sub button_up { 1123sub button_up {
… …
802 my ($self) = @_; 1136 my ($self) = @_;
803 1137
804 my ($w, $h ) = ($self->{w}, $self->{h}); 1138 my ($w, $h ) = ($self->{w}, $self->{h});
805 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1139 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
806 1140
807 glEnable GL_BLEND;
808 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
809 glEnable GL_TEXTURE_2D; 1141 glEnable GL_TEXTURE_2D;
810 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1142 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
811 1143
812 my $border = $self->border; 1144 my $border = $self->border;
813 1145
814 glColor @{ $self->{border_bg} }; 1146 glColor @{ $self->{border_bg} };
815 $tex[1]->draw_quad (0, 0, $w, $border); 1147 $border[0]->draw_quad_alpha (0, 0, $w, $border);
816 $tex[3]->draw_quad (0, $border, $border, $ch); 1148 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
817 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1149 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
818 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1150 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
819 1151
820 my $bg = $tex[0]; 1152 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1153 glColor @{ $self->{bg} };
821 1154
822 # TODO: repeat texture not scale 1155 # TODO: repeat texture not scale
823 my $rep_x = $cw / $bg->{w}; 1156 # solve this better(?)
824 my $rep_y = $ch / $bg->{h}; 1157 $bg->{s} = $cw / $bg->{w};
825 1158 $bg->{t} = $ch / $bg->{h};
826 glColor @{ $self->{bg} };
827
828 $bg->{s} = $rep_x;
829 $bg->{t} = $rep_y;
830 $bg->{wrap_mode} = 1;
831 $bg->draw_quad ($border, $border, $cw, $ch); 1159 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1160 }
832 1161
833 glDisable GL_TEXTURE_2D; 1162 glDisable GL_TEXTURE_2D;
834 glDisable GL_BLEND;
835 1163
836 $self->{title}->draw if $self->{title}; 1164 $self->{title}->draw if $self->{title};
1165
837 $self->child->draw; 1166 $self->child->draw;
838} 1167}
839 1168
840############################################################################# 1169#############################################################################
841 1170
… …
850sub new { 1179sub new {
851 my $class = shift; 1180 my $class = shift;
852 1181
853 $class->SUPER::new ( 1182 $class->SUPER::new (
854 col_expand => [], 1183 col_expand => [],
855 @_ 1184 @_,
856 ) 1185 )
1186}
1187
1188sub children {
1189 grep $_, map @$_, grep $_, @{ $_[0]{children} }
857} 1190}
858 1191
859sub add { 1192sub add {
860 my ($self, $x, $y, $child) = @_; 1193 my ($self, $x, $y, $child) = @_;
861 1194
862 $child->set_parent ($self); 1195 $child->set_parent ($self);
863 $self->{children}[$y][$x] = $child; 1196 $self->{children}[$y][$x] = $child;
864 1197
865 $child->check_size; 1198 $self->realloc;
866} 1199}
867 1200
868# TODO: move to container class maybe? send childs a signal on removal? 1201# TODO: move to container class maybe? send children a signal on removal?
869sub clear { 1202sub clear {
870 my ($self) = @_; 1203 my ($self) = @_;
871 1204
1205 my @children = $self->children;
872 delete $self->{children}; 1206 delete $self->{children};
873 $self->update; 1207
1208 for (@children) {
1209 delete $_->{parent};
1210 $_->hide;
1211 }
1212
1213 $self->realloc;
874} 1214}
875 1215
876sub get_wh { 1216sub get_wh {
877 my ($self) = @_; 1217 my ($self) = @_;
878 1218
… …
905 (sum @$hs), 1245 (sum @$hs),
906 ) 1246 )
907} 1247}
908 1248
909sub size_allocate { 1249sub size_allocate {
910 my ($self, $w, $h) = @_; 1250 my ($self, $w, $h, $changed) = @_;
911 1251
912 my ($ws, $hs) = $self->get_wh; 1252 my ($ws, $hs) = $self->get_wh;
913 1253
914 my $req_w = sum @$ws; 1254 my $req_w = (sum @$ws) || 1;
915 my $req_h = sum @$hs; 1255 my $req_h = (sum @$hs) || 1;
916 1256
917 # TODO: nicer code && do row_expand 1257 # TODO: nicer code && do row_expand
918 my @col_expand = @{$self->{col_expand}}; 1258 my @col_expand = @{$self->{col_expand}};
919 @col_expand = (1) x @$ws unless @col_expand; 1259 @col_expand = (1) x @$ws unless @col_expand;
920 my $col_expand = (sum @col_expand) || 1; 1260 my $col_expand = (sum @col_expand) || 1;
… …
974 } 1314 }
975} 1315}
976 1316
977############################################################################# 1317#############################################################################
978 1318
1319package CFClient::UI::Box;
1320
1321our @ISA = CFClient::UI::Container::;
1322
1323sub size_request {
1324 my ($self) = @_;
1325
1326 $self->{vertical}
1327 ? (
1328 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1329 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1330 )
1331 : (
1332 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1333 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1334 )
1335}
1336
1337sub size_allocate {
1338 my ($self, $w, $h, $changed) = @_;
1339
1340 my $space = $self->{vertical} ? $h : $w;
1341 my $children = $self->{children};
1342
1343 my @req;
1344
1345 if ($self->{homogeneous}) {
1346 @req = ($space / (@$children || 1)) x @$children;
1347 } else {
1348 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1349 my $req = List::Util::sum @req;
1350
1351 if ($req > $space) {
1352 # ah well, not enough space
1353 $_ *= $space / $req for @req;
1354 } else {
1355 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1356
1357 $space = ($space - $req) / $expand; # remaining space to give away
1358
1359 $req[$_] += $space * $children->[$_]{expand}
1360 for 0 .. $#$children;
1361 }
1362 }
1363
1364 CFClient::UI::harmonize \@req;
1365
1366 my $pos = 0;
1367 for (0 .. $#$children) {
1368 my $alloc = $req[$_];
1369 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1370
1371 $pos += $alloc;
1372 }
1373
1374 1
1375}
1376
1377#############################################################################
1378
979package CFClient::UI::HBox; 1379package CFClient::UI::HBox;
980 1380
981# TODO: wrap into common Box base class
982
983our @ISA = CFClient::UI::Container::; 1381our @ISA = CFClient::UI::Box::;
984 1382
985sub size_request { 1383sub new {
986 my ($self) = @_; 1384 my $class = shift;
987 1385
988 my @alloc = map [$_->size_request], @{$self->{children}}; 1386 $class->SUPER::new (
989 1387 vertical => 0,
990 ( 1388 @_,
991 (List::Util::sum map $_->[0], @alloc),
992 (List::Util::max map $_->[1], @alloc),
993 ) 1389 )
994} 1390}
995 1391
996sub size_allocate {
997 my ($self, $w, $h) = @_;
998
999 ($h, $w) = ($w, $h);
1000
1001 my $children = $self->{children};
1002
1003 my @h = map $_->{req_w}, @$children;
1004
1005 my $req_h = List::Util::sum @h;
1006
1007 if ($req_h > $h) {
1008 # ah well, not enough space
1009 $_ *= $h / $req_h for @h;
1010 } else {
1011 my $exp = List::Util::sum map $_->{expand}, @$children;
1012 $exp ||= 1;
1013
1014 for (0 .. $#$children) {
1015 my $child = $children->[$_];
1016
1017 my $alloc_h = $h[$_];
1018 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1019 $h[$_] = $alloc_h;
1020 }
1021 }
1022
1023 CFClient::UI::harmonize \@h;
1024
1025 my $y = 0;
1026 for (0 .. $#$children) {
1027 my $child = $children->[$_];
1028 my $h = $h[$_];
1029 $child->configure ($y, 0, $h, $w);
1030
1031 $y += $h;
1032 }
1033
1034 1
1035}
1036
1037############################################################################# 1392#############################################################################
1038 1393
1039package CFClient::UI::VBox; 1394package CFClient::UI::VBox;
1040 1395
1041# TODO: wrap into common Box base class
1042
1043our @ISA = CFClient::UI::Container::; 1396our @ISA = CFClient::UI::Box::;
1044 1397
1045sub size_request { 1398sub new {
1046 my ($self) = @_; 1399 my $class = shift;
1047 1400
1048 my @alloc = map [$_->size_request], @{$self->{children}}; 1401 $class->SUPER::new (
1049 1402 vertical => 1,
1050 ( 1403 @_,
1051 (List::Util::max map $_->[0], @alloc),
1052 (List::Util::sum map $_->[1], @alloc),
1053 ) 1404 )
1054} 1405}
1055 1406
1056sub size_allocate {
1057 my ($self, $w, $h) = @_;
1058
1059 my $children = $self->{children};
1060
1061 my @h = map $_->{req_h}, @$children;
1062
1063 my $req_h = List::Util::sum @h;
1064
1065 if ($req_h > $h) {
1066 # ah well, not enough space
1067 $_ *= $h / $req_h for @h;
1068 } else {
1069 my $exp = List::Util::sum map $_->{expand}, @$children;
1070 $exp ||= 1;
1071
1072 for (0 .. $#$children) {
1073 my $child = $children->[$_];
1074
1075 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1076 }
1077 }
1078
1079 CFClient::UI::harmonize \@h;
1080
1081 my $y = 0;
1082 for (0 .. $#$children) {
1083 my $child = $children->[$_];
1084 my $h = $h[$_];
1085 $child->configure (0, $y, $w, $h);
1086
1087 $y += $h;
1088 }
1089
1090 1
1091}
1092
1093############################################################################# 1407#############################################################################
1094 1408
1095package CFClient::UI::Label; 1409package CFClient::UI::Label;
1096 1410
1097our @ISA = CFClient::UI::Base::; 1411our @ISA = CFClient::UI::DrawBG::;
1098 1412
1099use CFClient::OpenGL; 1413use CFClient::OpenGL;
1100 1414
1101sub new { 1415sub new {
1102 my ($class, %arg) = @_; 1416 my ($class, %arg) = @_;
1103 1417
1104 my $self = $class->SUPER::new ( 1418 my $self = $class->SUPER::new (
1105 fg => [1, 1, 1], 1419 fg => [1, 1, 1],
1420 #bg => none
1421 #active_bg => none
1106 #font => default_font 1422 #font => default_font
1423 #text => initial text
1424 #markup => initial narkup
1425 #max_w => maximum pixel width
1426 ellipsise => 3, # end
1427 layout => (new CFClient::Layout),
1107 fontsize => 1, 1428 fontsize => 1,
1108 text => "",
1109 align => -1, 1429 align => -1,
1110 valign => -1, 1430 valign => -1,
1111 padding => 2, 1431 padding_x => 2,
1112 layout => new CFClient::Layout, 1432 padding_y => 2,
1113 can_events => 0, 1433 can_events => 0,
1114 %arg 1434 %arg
1115 ); 1435 );
1116 1436
1117 if (exists $self->{template}) { 1437 if (exists $self->{template}) {
1118 my $layout = new CFClient::Layout; 1438 my $layout = new CFClient::Layout;
1119 $layout->set_text (delete $self->{template}); 1439 $layout->set_text (delete $self->{template});
1120 $self->{template} = $layout; 1440 $self->{template} = $layout;
1121 } 1441 }
1122 1442
1123 $self->set_text (delete $self->{text}) if exists $self->{text}; 1443 if (exists $self->{markup}) {
1124 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1444 $self->set_markup (delete $self->{markup});
1445 } else {
1446 $self->set_text (delete $self->{text});
1447 }
1125 1448
1126 $self 1449 $self
1127} 1450}
1128 1451
1129sub escape_text { 1452sub escape($) {
1130 local $_ = $_[1]; 1453 local $_ = $_[0];
1131 1454
1132 s/&/&amp;/g; 1455 s/&/&amp;/g;
1133 s/>/&gt;/g; 1456 s/>/&gt;/g;
1134 s/</&lt;/g; 1457 s/</&lt;/g;
1135 1458
1136 $_[1] 1459 $_
1460}
1461
1462sub update {
1463 my ($self) = @_;
1464
1465 delete $self->{texture};
1466 $self->SUPER::update;
1137} 1467}
1138 1468
1139sub set_text { 1469sub set_text {
1140 my ($self, $text) = @_; 1470 my ($self, $text) = @_;
1141 1471
1472 return if $self->{text} eq "T$text";
1473 $self->{text} = "T$text";
1474
1475 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1142 $self->{layout}->set_text ($text); 1476 $self->{layout}->set_text ($text);
1143 1477
1144 delete $self->{texture}; 1478 $self->realloc;
1145 $self->check_size;
1146 $self->update; 1479 $self->update;
1147} 1480}
1148 1481
1149sub set_markup { 1482sub set_markup {
1150 my ($self, $markup) = @_; 1483 my ($self, $markup) = @_;
1151 1484
1485 return if $self->{text} eq "M$markup";
1486 $self->{text} = "M$markup";
1487
1488 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1489
1490 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1152 $self->{layout}->set_markup ($markup); 1491 $self->{layout}->set_markup ($markup);
1153 1492
1154 delete $self->{texture}; 1493 $self->realloc;
1155 $self->check_size;
1156 $self->update; 1494 $self->update;
1157} 1495}
1158 1496
1159sub size_request { 1497sub size_request {
1160 my ($self) = @_; 1498 my ($self) = @_;
1161 1499
1162 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1500 $self->{layout}->set_font ($self->{font}) if $self->{font};
1163 $self->{layout}->set_width ($self->{max_w} || -1); 1501 $self->{layout}->set_width ($self->{max_w} || -1);
1502 $self->{layout}->set_ellipsise ($self->{ellipsise});
1503 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1164 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1504 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1165 1505
1166 my ($w, $h) = $self->{layout}->size; 1506 my ($w, $h) = $self->{layout}->size;
1167 1507
1168 if (exists $self->{template}) { 1508 if (exists $self->{template}) {
… …
1173 1513
1174 $w = List::Util::max $w, $w2; 1514 $w = List::Util::max $w, $w2;
1175 $h = List::Util::max $h, $h2; 1515 $h = List::Util::max $h, $h2;
1176 } 1516 }
1177 1517
1178 ( 1518 ($w, $h)
1179 $w + $self->{padding} * 2,
1180 $h + $self->{padding} * 2,
1181 )
1182} 1519}
1183 1520
1184sub size_allocate { 1521sub size_allocate {
1185 my ($self, $w, $h) = @_; 1522 my ($self, $w, $h, $changed) = @_;
1186 1523
1187 delete $self->{texture}; 1524 delete $self->{texture}
1525 if $changed;
1188} 1526}
1189 1527
1190sub set_fontsize { 1528sub set_fontsize {
1191 my ($self, $fontsize) = @_; 1529 my ($self, $fontsize) = @_;
1192 1530
1193 $self->{fontsize} = $fontsize; 1531 $self->{fontsize} = $fontsize;
1194 delete $self->{texture}; 1532 delete $self->{texture};
1195 $self->check_size; 1533
1196 $self->update; 1534 $self->realloc;
1197} 1535}
1198 1536
1199sub _draw { 1537sub _draw {
1200 my ($self) = @_; 1538 my ($self) = @_;
1201 1539
1540 $self->SUPER::_draw; # draw background, if applicable
1541
1202 my $tex = $self->{texture} ||= do { 1542 my $tex = $self->{texture} ||= do {
1543 $self->{layout}->set_foreground (@{$self->{fg}});
1203 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1544 $self->{layout}->set_font ($self->{font}) if $self->{font};
1204 $self->{layout}->set_width ($self->{w}); 1545 $self->{layout}->set_width ($self->{w});
1546 $self->{layout}->set_ellipsise ($self->{ellipsise});
1547 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1205 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1548 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1549
1206 new_from_layout CFClient::Texture $self->{layout} 1550 my $tex = new_from_layout CFClient::Texture $self->{layout};
1551
1552 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1553 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1554 : ($self->{w} - $tex->{w}) * 0.5);
1555
1556 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1557 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1558 : ($self->{h} - $tex->{h}) * 0.5);
1559
1560 $tex
1207 }; 1561 };
1208 1562
1209 glEnable GL_BLEND;
1210 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1211 glEnable GL_TEXTURE_2D; 1563 glEnable GL_TEXTURE_2D;
1212 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1564 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1213 1565
1566 if ($tex->{format} == GL_ALPHA) {
1214 glColor @{$self->{fg}}; 1567 glColor @{$self->{fg}};
1215
1216 $self->{ox} = int (
1217 $self->{align} < 0 ? $self->{padding}
1218 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1219 : ($self->{w} - $tex->{w}) * 0.5
1220 );
1221
1222 $self->{oy} = int (
1223 $self->{valign} < 0 ? $self->{padding}
1224 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1225 : ($self->{h} - $tex->{h}) * 0.5
1226 );
1227
1228 $tex->draw_quad ($self->{ox}, $self->{oy}); 1568 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1569 } else {
1570 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1571 }
1229 1572
1230 glDisable GL_TEXTURE_2D; 1573 glDisable GL_TEXTURE_2D;
1231 glDisable GL_BLEND;
1232} 1574}
1233 1575
1234############################################################################# 1576#############################################################################
1235 1577
1236package CFClient::UI::EntryBase; 1578package CFClient::UI::EntryBase;
… …
1241 1583
1242sub new { 1584sub new {
1243 my $class = shift; 1585 my $class = shift;
1244 1586
1245 $class->SUPER::new ( 1587 $class->SUPER::new (
1246 fg => [1, 1, 1], 1588 fg => [1, 1, 1],
1247 bg => [0, 0, 0, 0.2], 1589 bg => [0, 0, 0, 0.2],
1248 active_bg => [1, 1, 1, 0.5], 1590 active_bg => [1, 1, 1, 0.5],
1249 active_fg => [0, 0, 0], 1591 active_fg => [0, 0, 0],
1250 can_hover => 1, 1592 can_hover => 1,
1251 can_focus => 1, 1593 can_focus => 1,
1252 valign => 0, 1594 valign => 0,
1253 can_events => 1, 1595 can_events => 1,
1596 #text => ...
1254 @_ 1597 @_
1255 ) 1598 )
1256} 1599}
1257 1600
1258sub _set_text { 1601sub _set_text {
… …
1268 $self->{text} = $text; 1611 $self->{text} = $text;
1269 1612
1270 $text =~ s/./*/g if $self->{hidden}; 1613 $text =~ s/./*/g if $self->{hidden};
1271 $self->{layout}->set_text ("$text "); 1614 $self->{layout}->set_text ("$text ");
1272 1615
1273 $self->emit (changed => $self->{text}); 1616 $self->_emit (changed => $self->{text});
1617}
1618
1619sub set_text {
1620 my ($self, $text) = @_;
1621
1622 $self->{cursor} = length $text;
1623 $self->_set_text ($text);
1624
1625 $self->realloc;
1274} 1626}
1275 1627
1276sub get_text { 1628sub get_text {
1277 $_[0]{text} 1629 $_[0]{text}
1278} 1630}
… …
1281 my ($self) = @_; 1633 my ($self) = @_;
1282 1634
1283 my ($w, $h) = $self->SUPER::size_request; 1635 my ($w, $h) = $self->SUPER::size_request;
1284 1636
1285 ($w + 1, $h) # add 1 for cursor 1637 ($w + 1, $h) # add 1 for cursor
1286}
1287
1288sub size_allocate {
1289 my ($self, $w, $h) = @_;
1290
1291 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1292}
1293
1294sub set_text {
1295 my ($self, $text) = @_;
1296
1297 $self->{cursor} = length $text;
1298 $self->_set_text ($text);
1299 $self->update;
1300} 1638}
1301 1639
1302sub key_down { 1640sub key_down {
1303 my ($self, $ev) = @_; 1641 my ($self, $ev) = @_;
1304 1642
… …
1306 my $sym = $ev->{sym}; 1644 my $sym = $ev->{sym};
1307 my $uni = $ev->{unicode}; 1645 my $uni = $ev->{unicode};
1308 1646
1309 my $text = $self->get_text; 1647 my $text = $self->get_text;
1310 1648
1311 if ($sym == 8) { 1649 if ($uni == 8) {
1312 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1650 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1313 } elsif ($sym == 127) { 1651 } elsif ($uni == 127) {
1314 substr $text, $self->{cursor}, 1, ""; 1652 substr $text, $self->{cursor}, 1, "";
1315 } elsif ($sym == CFClient::SDLK_LEFT) { 1653 } elsif ($sym == CFClient::SDLK_LEFT) {
1316 --$self->{cursor} if $self->{cursor}; 1654 --$self->{cursor} if $self->{cursor};
1317 } elsif ($sym == CFClient::SDLK_RIGHT) { 1655 } elsif ($sym == CFClient::SDLK_RIGHT) {
1318 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1656 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1319 } elsif ($sym == CFClient::SDLK_HOME) { 1657 } elsif ($sym == CFClient::SDLK_HOME) {
1320 $self->{cursor} = 0; 1658 $self->{cursor} = 0;
1321 } elsif ($sym == CFClient::SDLK_END) { 1659 } elsif ($sym == CFClient::SDLK_END) {
1322 $self->{cursor} = length $text; 1660 $self->{cursor} = length $text;
1323 } elsif ($sym == 27) { 1661 } elsif ($uni == 27) {
1324 $self->emit ('escape'); 1662 $self->_emit ('escape');
1325 } elsif ($uni) { 1663 } elsif ($uni) {
1326 substr $text, $self->{cursor}++, 0, chr $uni; 1664 substr $text, $self->{cursor}++, 0, chr $uni;
1327 } 1665 }
1328 1666
1329 $self->_set_text ($text); 1667 $self->_set_text ($text);
1330 $self->update; 1668
1669 $self->realloc;
1331} 1670}
1332 1671
1333sub focus_in { 1672sub focus_in {
1334 my ($self) = @_; 1673 my ($self) = @_;
1335 1674
… …
1411 my ($self, $ev) = @_; 1750 my ($self, $ev) = @_;
1412 1751
1413 my $sym = $ev->{sym}; 1752 my $sym = $ev->{sym};
1414 1753
1415 if ($sym == 13) { 1754 if ($sym == 13) {
1755 unshift @{$self->{history}},
1756 my $txt = $self->get_text;
1757 $self->{history_pointer} = -1;
1758 $self->{history_saveback} = '';
1416 $self->emit (activate => $self->get_text); 1759 $self->_emit (activate => $txt);
1417 $self->update; 1760 $self->update;
1761
1762 } elsif ($sym == CFClient::SDLK_UP) {
1763 if ($self->{history_pointer} < 0) {
1764 $self->{history_saveback} = $self->get_text;
1765 }
1766 if (@{$self->{history} || []} > 0) {
1767 $self->{history_pointer}++;
1768 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1769 $self->{history_pointer} = @{$self->{history} || []} - 1;
1770 }
1771 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1772 }
1773
1774 } elsif ($sym == CFClient::SDLK_DOWN) {
1775 $self->{history_pointer}--;
1776 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1777
1778 if ($self->{history_pointer} >= 0) {
1779 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1780 } else {
1781 $self->set_text ($self->{history_saveback});
1782 }
1418 1783
1419 } else { 1784 } else {
1420 $self->SUPER::key_down ($ev); 1785 $self->SUPER::key_down ($ev);
1421 } 1786 }
1422 1787
… …
1436 1801
1437sub new { 1802sub new {
1438 my $class = shift; 1803 my $class = shift;
1439 1804
1440 $class->SUPER::new ( 1805 $class->SUPER::new (
1441 padding => 4, 1806 padding_x => 4,
1807 padding_y => 4,
1442 fg => [1, 1, 1], 1808 fg => [1, 1, 1],
1443 bg => [1, 1, 1, 0.2],
1444 active_fg => [0, 0, 1], 1809 active_fg => [0, 0, 1],
1445 can_hover => 1, 1810 can_hover => 1,
1446 align => 0, 1811 align => 0,
1447 valign => 0, 1812 valign => 0,
1448 can_events => 1, 1813 can_events => 1,
1449 @_ 1814 @_
1450 ) 1815 )
1451} 1816}
1452 1817
1818sub activate { }
1819
1453sub button_up { 1820sub button_up {
1454 my ($self, $ev, $x, $y) = @_; 1821 my ($self, $ev, $x, $y) = @_;
1455 1822
1823 $self->emit ("activate")
1456 if ($x >= 0 && $x < $self->{w} 1824 if $x >= 0 && $x < $self->{w}
1457 && $y >= 0 && $y < $self->{h}) { 1825 && $y >= 0 && $y < $self->{h};
1458 $self->emit ("activate");
1459 }
1460} 1826}
1461 1827
1462sub _draw { 1828sub _draw {
1463 my ($self) = @_; 1829 my ($self) = @_;
1464 1830
… …
1466 1832
1467 if ($GRAB == $self) { 1833 if ($GRAB == $self) {
1468 $self->{fg} = $self->{active_fg}; 1834 $self->{fg} = $self->{active_fg};
1469 } 1835 }
1470 1836
1471 glEnable GL_BLEND;
1472 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1473 glEnable GL_TEXTURE_2D; 1837 glEnable GL_TEXTURE_2D;
1474 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1838 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1475 glColor 0, 0, 0, 1; 1839 glColor 0, 0, 0, 1;
1476 1840
1477 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1841 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1478 1842
1479 glDisable GL_TEXTURE_2D; 1843 glDisable GL_TEXTURE_2D;
1480 glDisable GL_BLEND;
1481 1844
1482 $self->SUPER::_draw; 1845 $self->SUPER::_draw;
1483} 1846}
1484 1847
1485############################################################################# 1848#############################################################################
… …
1496 1859
1497sub new { 1860sub new {
1498 my $class = shift; 1861 my $class = shift;
1499 1862
1500 $class->SUPER::new ( 1863 $class->SUPER::new (
1501 padding => 2, 1864 padding_x => 2,
1865 padding_y => 2,
1502 fg => [1, 1, 1], 1866 fg => [1, 1, 1],
1503 active_fg => [1, 1, 0], 1867 active_fg => [1, 1, 0],
1868 bg => [0, 0, 0, 0.2],
1869 active_bg => [1, 1, 1, 0.5],
1504 state => 0, 1870 state => 0,
1505 can_hover => 1, 1871 can_hover => 1,
1506 @_ 1872 @_
1507 ) 1873 )
1508} 1874}
1509 1875
1510sub size_request { 1876sub size_request {
1511 my ($self) = @_; 1877 my ($self) = @_;
1512 1878
1513 ($self->{padding} * 2 + 6) x 2 1879 (6) x 2
1514} 1880}
1515 1881
1516sub button_down { 1882sub button_down {
1517 my ($self, $ev, $x, $y) = @_; 1883 my ($self, $ev, $x, $y) = @_;
1518 1884
1519 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1885 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1520 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1886 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1521 $self->{state} = !$self->{state}; 1887 $self->{state} = !$self->{state};
1522 $self->emit (changed => $self->{state}); 1888 $self->_emit (changed => $self->{state});
1523 } 1889 }
1524} 1890}
1525 1891
1526sub _draw { 1892sub _draw {
1527 my ($self) = @_; 1893 my ($self) = @_;
1528 1894
1529 $self->SUPER::_draw; 1895 $self->SUPER::_draw;
1530 1896
1531 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1897 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1532 1898
1533 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1899 my ($w, $h) = @$self{qw(w h)};
1900
1901 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1534 1902
1535 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1903 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1536 1904
1537 glEnable GL_BLEND; 1905 my $tex = $self->{state} ? $tex[1] : $tex[0];
1906
1538 glEnable GL_TEXTURE_2D; 1907 glEnable GL_TEXTURE_2D;
1539 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1540
1541 my $tex = $self->{state} ? $tex[1] : $tex[0];
1542
1543 $tex->draw_quad (0, 0, $s, $s); 1908 $tex->draw_quad_alpha (0, 0, $s, $s);
1544
1545 glDisable GL_TEXTURE_2D; 1909 glDisable GL_TEXTURE_2D;
1546 glDisable GL_BLEND;
1547} 1910}
1548 1911
1549############################################################################# 1912#############################################################################
1550 1913
1551package CFClient::UI::Image; 1914package CFClient::UI::Image;
… …
1594 glTranslate 0, -$self->{w}, 0; 1957 glTranslate 0, -$self->{w}, 0;
1595 1958
1596 ($w, $h) = ($h, $w); 1959 ($w, $h) = ($h, $w);
1597 } 1960 }
1598 1961
1599 glEnable GL_BLEND;
1600 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1601 glEnable GL_TEXTURE_2D; 1962 glEnable GL_TEXTURE_2D;
1602 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1963 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1603 1964
1604 $tex->draw_quad (0, 0, $w, $h); 1965 $tex->draw_quad_alpha (0, 0, $w, $h);
1605 1966
1606 glDisable GL_BLEND;
1607 glDisable GL_TEXTURE_2D; 1967 glDisable GL_TEXTURE_2D;
1608} 1968}
1609 1969
1610############################################################################# 1970#############################################################################
1611 1971
… …
1659} 2019}
1660 2020
1661sub set_max { 2021sub set_max {
1662 my ($self, $max) = @_; 2022 my ($self, $max) = @_;
1663 2023
2024 return if $self->{max_val} == $max;
2025
1664 $self->{max_val} = $max; 2026 $self->{max_val} = $max;
2027 $self->update;
1665} 2028}
1666 2029
1667sub set_value { 2030sub set_value {
1668 my ($self, $val, $max) = @_; 2031 my ($self, $val, $max) = @_;
1669 2032
1670 $self->set_max ($max) 2033 $self->set_max ($max)
1671 if defined $max; 2034 if defined $max;
1672 2035
1673 $max = $self->{max_val}; 2036 return if $self->{val} == $val;
2037
1674 $self->{val} = $val; 2038 $self->{val} = $val;
1675
1676 $self->update; 2039 $self->update;
1677} 2040}
1678 2041
1679sub _draw { 2042sub _draw {
1680 my ($self) = @_; 2043 my ($self) = @_;
… …
1743 2106
1744sub new { 2107sub new {
1745 my ($class, %arg) = @_; 2108 my ($class, %arg) = @_;
1746 2109
1747 my $self = $class->SUPER::new ( 2110 my $self = $class->SUPER::new (
1748 tooltip => $arg{type}, 2111 tooltip => $arg{type},
2112 can_hover => 1,
2113 can_events => 1,
1749 %arg, 2114 %arg,
1750 ); 2115 );
1751 2116
1752 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999", can_events => 1, can_hover => 1); 2117 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1753 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_events => 1, can_hover => 1); 2118 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1754 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999", can_events => 1, can_hover => 1); 2119 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1755 2120
1756 $self 2121 $self
1757} 2122}
1758 2123
1759sub set_fontsize { 2124sub set_fontsize {
… …
1761 2126
1762 $self->{value}->set_fontsize ($fsize); 2127 $self->{value}->set_fontsize ($fsize);
1763 $self->{max} ->set_fontsize ($fsize); 2128 $self->{max} ->set_fontsize ($fsize);
1764} 2129}
1765 2130
2131sub set_max {
2132 my ($self, $max) = @_;
2133
2134 $self->{gauge}->set_max ($max);
2135 $self->{max}->set_text ($max);
2136}
2137
1766sub set_value { 2138sub set_value {
1767 my ($self, $val, $max) = @_; 2139 my ($self, $val, $max) = @_;
1768 2140
1769 $self->set_max ($max) 2141 $self->set_max ($max)
1770 if defined $max; 2142 if defined $max;
1771 2143
1772 $self->{gauge}->set_value ($val, $max); 2144 $self->{gauge}->set_value ($val, $max);
1773 $self->{value}->set_text ($val); 2145 $self->{value}->set_text ($val);
1774}
1775
1776sub set_max {
1777 my ($self, $max) = @_;
1778
1779 $self->{gauge}->set_max ($max);
1780 $self->{max}->set_text ($max);
1781} 2146}
1782 2147
1783############################################################################# 2148#############################################################################
1784 2149
1785package CFClient::UI::Slider; 2150package CFClient::UI::Slider;
… …
1795 qw(s1_slider.png s1_slider_bg.png); 2160 qw(s1_slider.png s1_slider_bg.png);
1796 2161
1797sub new { 2162sub new {
1798 my $class = shift; 2163 my $class = shift;
1799 2164
1800 # range [value, low, high, page] 2165 # range [value, low, high, page, unit]
1801 2166
1802 # TODO: 0-width page 2167 # TODO: 0-width page
1803 # TODO: req_w/h are wrong with vertical 2168 # TODO: req_w/h are wrong with vertical
1804 # TODO: calculations are off 2169 # TODO: calculations are off
1805 my $self = $class->SUPER::new ( 2170 my $self = $class->SUPER::new (
1806 fg => [1, 1, 1], 2171 fg => [1, 1, 1],
1807 active_fg => [0, 0, 0], 2172 active_fg => [0, 0, 0],
2173 bg => [0, 0, 0, 0.2],
2174 active_bg => [1, 1, 1, 0.5],
1808 range => [0, 0, 100, 10], 2175 range => [0, 0, 100, 10, 0],
1809 req_w => 20, 2176 min_w => $::WIDTH / 80,
1810 req_h => 20, 2177 min_h => $::WIDTH / 80,
1811 vertical => 0, 2178 vertical => 0,
1812 can_hover => 1, 2179 can_hover => 1,
1813 inner_pad => 5, 2180 inner_pad => 0.02,
1814 @_ 2181 @_
1815 ); 2182 );
1816 2183
2184 $self->set_value ($self->{range}[0]);
2185 $self->update;
2186
1817 $self 2187 $self
1818} 2188}
1819 2189
2190sub changed { }
2191
2192sub set_range {
2193 my ($self, $range) = @_;
2194
2195 ($range, $self->{range}) = ($self->{range}, $range);
2196
2197 $self->update
2198 if "@$range" ne "@{$self->{range}}";
2199}
2200
2201sub set_value {
2202 my ($self, $value) = @_;
2203
2204 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2205
2206 $hi = $lo + 1 if $hi <= $lo;
2207
2208 $page = $hi - $lo if $page > $hi - $lo;
2209
2210 $value = $lo if $value < $lo;
2211 $value = $hi - $page if $value > $hi - $page;
2212
2213 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2214 if $unit;
2215
2216 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2217
2218 if ($value != $old_value) {
2219 $self->_emit (changed => $value);
2220 $self->update;
2221 }
2222}
2223
1820sub size_request { 2224sub size_request {
1821 my ($self) = @_; 2225 my ($self) = @_;
1822 2226
1823 my $w = $self->{req_w}; 2227 ($self->{req_w}, $self->{req_h})
1824 my $h = $self->{req_h};
1825
1826 $self->{vertical} ? ($h, $w) : ($w, $h)
1827} 2228}
1828 2229
1829sub button_down { 2230sub button_down {
1830 my ($self, $ev, $x, $y) = @_; 2231 my ($self, $ev, $x, $y) = @_;
1831 2232
1832 $self->SUPER::button_down ($ev, $x, $y); 2233 $self->SUPER::button_down ($ev, $x, $y);
2234
2235 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2236
1833 $self->mouse_motion ($ev, $x, $y); 2237 $self->mouse_motion ($ev, $x, $y);
1834} 2238}
1835 2239
1836sub mouse_motion { 2240sub mouse_motion {
1837 my ($self, $ev, $x, $y) = @_; 2241 my ($self, $ev, $x, $y) = @_;
1838 2242
1839 if ($GRAB == $self) { 2243 if ($GRAB == $self) {
2244 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2245
2246 my (undef, $lo, $hi, $page) = @{$self->{range}};
2247
2248 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2249
2250 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2251 }
2252}
2253
2254sub update {
2255 my ($self) = @_;
2256
2257 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2258 $self->set_value ($self->{range}[0]);
2259
1840 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2260 my ($value, $lo, $hi, $page) = @{$self->{range}};
2261 my $range = ($hi - $page - $lo) || 1e-100;
1841 2262
1842 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2263 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1843 2264
1844 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2265 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1845 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2266 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1846 2267
1847 $x -= $inner_pad_px; # substract the padding 2268 $value = ($value - $lo) / $range;
1848 $x = $x * ($hi - $lo) / $inner_w + $lo; 2269 $value = $value * $self->{scale} + $self->{offset};
1849 $x = $lo if $x < $lo;
1850 $x = $hi - $page if $x > $hi - $page;
1851 $self->{range}[0] = $x;
1852 2270
1853 $self->emit (changed => $x); 2271 $self->{knob_x} = $value - $knob_w * 0.5;
1854 $self->update; 2272 $self->{knob_w} = $knob_w;
1855 } 2273 });
1856}
1857 2274
1858# the inner_* stuff is for generating a padding for the slider handle, 2275 $self->SUPER::update;
1859# so that the handle doesn't leave the texture. This calculation isn't 100%
1860# correct propably, but it does the job for now
1861sub _calc_inner_pad_px {
1862 my ($self, $w) = @_;
1863 ($w / 100) * $self->{inner_pad} # % to pixels
1864} 2276}
1865 2277
1866sub _draw { 2278sub _draw {
1867 my ($self) = @_; 2279 my ($self) = @_;
1868 2280
1869 $self->SUPER::_draw (); 2281 $self->SUPER::_draw ();
1870 2282
1871 my ($w, $h) = @$self{qw(w h)}; 2283 glScale $self->{w}, $self->{h};
1872 2284
1873 if ($self->{vertical}) { 2285 if ($self->{vertical}) {
1874 # draw a vertical slider like a rotated horizontal slider 2286 # draw a vertical slider like a rotated horizontal slider
1875 2287
2288 glTranslate 1, 0, 0;
1876 glRotate 90, 0, 0, 1; 2289 glRotate 90, 0, 0, 1;
1877 glTranslate 0, -$self->{w}, 0;
1878
1879 ($w, $h) = ($h, $w);
1880 } 2290 }
1881 2291
1882 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2292 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1883 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2293 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1884 2294
1885 my ($value, $lo, $hi, $page) = @{$self->{range}};
1886
1887 $hi = $value + 1 if $lo == $hi;
1888
1889 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1890 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1891
1892 $page = int $page * $inner_w / ($hi - $lo);
1893 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1894
1895 $w -= $page;
1896 $page &= ~1;
1897 glTranslate $page * 0.5, 0, 0;
1898 $page ||= 2;
1899
1900 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1901 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1902
1903 glEnable GL_BLEND;
1904 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1905 glEnable GL_TEXTURE_2D; 2295 glEnable GL_TEXTURE_2D;
1906 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2296 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1907 2297
1908 # draw background 2298 # draw background
1909 $tex[1]->draw_quad (0, 0, $w, $h); 2299 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1910 2300
1911 # draw handle 2301 # draw handle
1912 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2302 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
1913 2303
1914 glDisable GL_BLEND;
1915 glDisable GL_TEXTURE_2D; 2304 glDisable GL_TEXTURE_2D;
1916} 2305}
2306
2307#############################################################################
2308
2309package CFClient::UI::ValSlider;
2310
2311our @ISA = CFClient::UI::HBox::;
2312
2313sub new {
2314 my ($class, %arg) = @_;
2315
2316 my $range = delete $arg{range};
2317
2318 my $self = $class->SUPER::new (
2319 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2320 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2321 to_value => sub { shift },
2322 from_value => sub { shift },
2323 %arg,
2324 );
2325
2326 $self->{slider}->connect (changed => sub {
2327 my ($self, $value) = @_;
2328 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2329 $self->{parent}->emit (changed => $value);
2330 });
2331
2332# $self->{entry}->connect (changed => sub {
2333# my ($self, $value) = @_;
2334# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2335# $self->{parent}->emit (changed => $value);
2336# });
2337
2338 $self->add ($self->{slider}, $self->{entry});
2339
2340 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2341
2342 $self
2343}
2344
2345sub set_range { shift->{slider}->set_range (@_) }
2346sub set_value { shift->{slider}->set_value (@_) }
1917 2347
1918############################################################################# 2348#############################################################################
1919 2349
1920package CFClient::UI::TextView; 2350package CFClient::UI::TextView;
1921 2351
… …
1925 2355
1926sub new { 2356sub new {
1927 my $class = shift; 2357 my $class = shift;
1928 2358
1929 my $self = $class->SUPER::new ( 2359 my $self = $class->SUPER::new (
1930 fontsize => 1, 2360 fontsize => 1,
2361 can_events => 0,
1931 #font => default_font 2362 #font => default_font
1932 @_, 2363 @_,
1933 2364
1934 layout => (new CFClient::Layout), 2365 layout => (new CFClient::Layout 1),
1935 par => [], 2366 par => [],
1936 height => 0, 2367 height => 0,
1937 children => [ 2368 children => [
1938 (new CFClient::UI::Empty expand => 1), 2369 (new CFClient::UI::Empty expand => 1),
1939 (new CFClient::UI::Slider vertical => 1), 2370 (new CFClient::UI::Slider vertical => 1),
1940 ], 2371 ],
1941 ); 2372 );
1942 2373
1943 $self->{children}[1]->connect (changed => sub { 2374 $self->{children}[1]->connect (changed => sub { $self->update });
1944 $self->update;
1945 });
1946 2375
1947 $self 2376 $self
1948} 2377}
1949 2378
1950sub set_fontsize { 2379sub set_fontsize {
… …
1952 2381
1953 $self->{fontsize} = $fontsize; 2382 $self->{fontsize} = $fontsize;
1954 $self->reflow; 2383 $self->reflow;
1955} 2384}
1956 2385
1957sub text_height {
1958 my ($self, $text) = @_;
1959
1960 my $layout = $self->{layout};
1961
1962 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1963 $layout->set_width ($self->{w});
1964 $layout->set_text ($text);
1965
1966 ($layout->size)[1]
1967}
1968
1969sub reflow {
1970 my ($self) = @_;
1971
1972 $self->{need_reflow}++;
1973 $self->update;
1974}
1975
1976sub size_allocate { 2386sub size_allocate {
1977 my ($self, $w, $h) = @_; 2387 my ($self, $w, $h, $changed) = @_;
1978 2388
1979 $self->SUPER::size_allocate ($w, $h); 2389 $self->SUPER::size_allocate ($w, $h, $changed);
2390
2391 return unless $changed;
1980 2392
1981 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2393 $self->{layout}->set_font ($self->{font}) if $self->{font};
1982 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2394 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1983 $self->{layout}->set_width ($self->{children}[0]{w}); 2395 $self->{layout}->set_width ($self->{children}[0]{w});
1984 2396
1985 $self->reflow; 2397 $self->reflow;
1986} 2398}
1987 2399
2400sub text_size {
2401 my ($self, $text, $indent) = @_;
2402
2403 my $layout = $self->{layout};
2404
2405 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2406 $layout->set_width ($self->{children}[0]{w} - $indent);
2407 $layout->set_markup ($text);
2408
2409 $layout->size
2410}
2411
2412sub reflow {
2413 my ($self) = @_;
2414
2415 $self->{need_reflow}++;
2416 $self->update;
2417}
2418
2419sub set_offset {
2420 my ($self, $offset) = @_;
2421
2422 # todo: base offset on lines or so, not on pixels
2423 $self->{children}[1]->set_value ($offset);
2424}
2425
2426sub clear {
2427 my ($self) = @_;
2428
2429 $self->{par} = [];
2430 $self->{height} = 0;
2431 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2432}
2433
1988sub add_paragraph { 2434sub add_paragraph {
1989 my ($self, $color, $text) = @_; 2435 my ($self, $color, $text, $indent) = @_;
1990 2436
1991 #TODO: intelligently "reformat" paragraph 2437 for my $line (split /\n/, $text) {
1992 2438 my ($w, $h) = $self->text_size ($line);
1993 my $height = $self->text_height ($text);
1994
1995 $self->{height} += $height; 2439 $self->{height} += $h;
2440 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2441 }
1996 2442
1997 push @{$self->{par}}, [$height, $color, $text];
1998
1999 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2443 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2000 $self->{children}[1]->update;
2001} 2444}
2002 2445
2003sub update { 2446sub update {
2004 my ($self) = @_; 2447 my ($self) = @_;
2005 2448
… …
2007 2450
2008 return unless $self->{h} > 0; 2451 return unless $self->{h} > 0;
2009 2452
2010 delete $self->{texture}; 2453 delete $self->{texture};
2011 2454
2012 $ROOT->on_refresh ($self, sub { 2455 $ROOT->on_post_alloc ($self, sub {
2456 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2457
2013 if (delete $self->{need_reflow}) { 2458 if (delete $self->{need_reflow}) {
2014 my $height = 0; 2459 my $height = 0;
2015 2460
2016 $height += $_->[0] = $self->text_height ($_->[2]) 2461 my $layout = $self->{layout};
2462
2463 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2464
2017 for @{$self->{par}}; 2465 for (@{$self->{par}}) {
2466 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2467 $layout->set_width ($W - $_->[3]);
2468 $layout->set_markup ($_->[4]);
2469 my ($w, $h) = $layout->size;
2470 $_->[0] = $w + $_->[3];
2471 $_->[1] = $h;
2472 }
2473
2474 $height += $_->[1];
2475 }
2018 2476
2019 $self->{height} = $height; 2477 $self->{height} = $height;
2020 2478
2021 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2479 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2022 2480
2023 delete $self->{texture}; 2481 delete $self->{texture};
2024 } 2482 }
2025 2483
2026 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2484 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2027 glClearColor 0, 0, 0, 1; 2485 glClearColor 0.5, 0.5, 0.5, 0;
2028 glClear GL_COLOR_BUFFER_BIT; 2486 glClear GL_COLOR_BUFFER_BIT;
2029 2487
2488 my $top = int $self->{children}[1]{range}[0];
2489
2490 my $y0 = $top;
2491 my $y1 = $top + $H;
2492
2493 my $y = 0;
2494
2495 my $layout = $self->{layout};
2496
2497 $layout->set_font ($self->{font}) if $self->{font};
2498
2030 glEnable GL_BLEND; 2499 glEnable GL_BLEND;
2500 #TODO# not correct in windows where rgba is forced off
2031 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2501 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2032 glEnable GL_TEXTURE_2D;
2033 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2034
2035 my $top = int $self->{children}[1]{range}[0];
2036
2037 my $y0 = $top;
2038 my $y1 = $top + $self->{h};
2039
2040 my $y = 0;
2041
2042 my $layout = $self->{layout};
2043
2044 $layout->set_font ($self->{font}) if $self->{font};
2045 2502
2046 for my $par (@{$self->{par}}) { 2503 for my $par (@{$self->{par}}) {
2047 my $h = $par->[0]; 2504 my $h = $par->[1];
2048 2505
2049 if ($y0 < $y + $h && $y < $y1) { 2506 if ($y0 < $y + $h && $y < $y1) {
2507 $layout->set_foreground (@{ $par->[2] });
2508 $layout->set_width ($W - $par->[3]);
2050 $layout->set_text ($par->[2]); 2509 $layout->set_markup ($par->[4]);
2051 2510
2052 glColor @{ $par->[1] }; 2511 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2053 my ($W, $H) = $layout->size; 2512
2054 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2513 glRasterPos $par->[3], $y - $y0;
2514 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2055 } 2515 }
2056 2516
2057 $y += $h; 2517 $y += $h;
2058 } 2518 }
2059 2519
2060 glDisable GL_TEXTURE_2D;
2061 glDisable GL_BLEND; 2520 glDisable GL_BLEND;
2062 }; 2521 };
2063 }); 2522 });
2064} 2523}
2065 2524
2066sub _draw { 2525sub _draw {
2067 my ($self) = @_; 2526 my ($self) = @_;
2068 2527
2069 if ($self->{texture}) {
2070 glEnable GL_TEXTURE_2D; 2528 glEnable GL_TEXTURE_2D;
2071 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2529 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2530 glColor 1, 1, 1, 1;
2072 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2531 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2073 glDisable GL_TEXTURE_2D; 2532 glDisable GL_TEXTURE_2D;
2074 }
2075 2533
2076 $self->{children}[1]->draw; 2534 $self->{children}[1]->draw;
2077 2535
2078} 2536}
2079 2537
… …
2127 2585
2128sub new { 2586sub new {
2129 my $class = shift; 2587 my $class = shift;
2130 2588
2131 my $self = $class->SUPER::new ( 2589 my $self = $class->SUPER::new (
2132 state => 0, 2590 state => 0,
2133 connect_activate => \&toggle_flopper, 2591 on_activate => \&toggle_flopper,
2134 can_events => 1,
2135 @_ 2592 @_
2136 ); 2593 );
2137 2594
2138 if ($self->{state}) {
2139 $self->{state} = 0;
2140 $self->toggle_flopper;
2141 }
2142
2143 $self 2595 $self
2144} 2596}
2145 2597
2146sub toggle_flopper { 2598sub toggle_flopper {
2147 my ($self) = @_; 2599 my ($self) = @_;
2148 2600
2149 # TODO: use animation 2601 $self->{other}->toggle_visibility;
2150 if ($self->{state} = !$self->{state}) {
2151 $CFClient::UI::ROOT->add ($self->{other});
2152 $self->{other}->move ($self->coord2global (0, $self->{h}));
2153 $self->emit ("open");
2154 } else {
2155 $CFClient::UI::ROOT->remove ($self->{other});
2156 $self->emit ("close");
2157 }
2158
2159 $self->emit (changed => $self->{state});
2160} 2602}
2161 2603
2162############################################################################# 2604#############################################################################
2163 2605
2164package CFClient::UI::Tooltip; 2606package CFClient::UI::Tooltip;
… …
2174 @_, 2616 @_,
2175 can_events => 0, 2617 can_events => 0,
2176 ) 2618 )
2177} 2619}
2178 2620
2179sub set_text { 2621sub set_tooltip_from {
2180 my ($self, $text) = @_; 2622 my ($self, $widget) = @_;
2181 2623
2182 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2624 $self->add (new CFClient::UI::Label
2183 $self->{label}->set_text ($text); 2625 markup => $widget->{tooltip},
2184 $self->add ($self->{label}); 2626 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2627 fontsize => 0.8,
2628 fg => [0, 0, 0, 1],
2629 ellipsise => 0,
2630 font => ($widget->{tooltip_font} || $::FONT_PROP),
2631 );
2185} 2632}
2186 2633
2187sub size_request { 2634sub size_request {
2188 my ($self) = @_; 2635 my ($self) = @_;
2189 2636
2190 $self->child->set_max_size ($::WIDTH * 0.2);
2191
2192 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2637 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2193 2638
2194 ($w + 4, $h + 4) 2639 ($w + 4, $h + 4)
2195} 2640}
2196 2641
2642sub size_allocate {
2643 my ($self, $w, $h, $changed) = @_;
2644
2645 return unless $changed;
2646
2647 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed);
2648}
2649
2650sub visibility_change {
2651 my ($self, $visible) = @_;
2652
2653 return unless $visible;
2654
2655 $self->{root}->on_post_alloc ("move_$self" => sub {
2656 my $widget = $self->{owner}
2657 or return;
2658
2659 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2660
2661 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2662 if $x + $self->{w} > $::WIDTH;
2663
2664 $self->move_abs ($x, $y);
2665 });
2666}
2667
2197sub _draw { 2668sub _draw {
2198 my ($self) = @_; 2669 my ($self) = @_;
2199 2670
2200 glPushMatrix;
2201 glTranslate 0.375, 0.375; 2671 glTranslate 0.375, 0.375;
2202 2672
2203 my ($w, $h) = @$self{qw(w h)}; 2673 my ($w, $h) = @$self{qw(w h)};
2204 2674
2205 glColor 1, 0.8, 0.4; 2675 glColor 1, 0.8, 0.4;
… …
2216 glVertex 0 , $h; 2686 glVertex 0 , $h;
2217 glVertex $w, $h; 2687 glVertex $w, $h;
2218 glVertex $w, 0; 2688 glVertex $w, 0;
2219 glEnd; 2689 glEnd;
2220 2690
2221 glPopMatrix; 2691 glTranslate 2 - 0.375, 2 - 0.375;
2222 2692
2223 glTranslate 2, 2;
2224 $self->SUPER::_draw; 2693 $self->SUPER::_draw;
2225} 2694}
2226 2695
2227############################################################################# 2696#############################################################################
2228 2697
2698package CFClient::UI::Face;
2699
2700our @ISA = CFClient::UI::Base::;
2701
2702use CFClient::OpenGL;
2703
2704sub new {
2705 my $class = shift;
2706
2707 my $self = $class->SUPER::new (
2708 aspect => 1,
2709 can_events => 0,
2710 @_,
2711 );
2712
2713 if ($self->{anim} && $self->{animspeed}) {
2714 Scalar::Util::weaken (my $widget = $self);
2715
2716 $self->{timer} = Event->timer (
2717 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2718 hard => 1,
2719 interval => $self->{animspeed},
2720 cb => sub {
2721 ++$widget->{frame};
2722 $widget->update;
2723 },
2724 );
2725 }
2726
2727 $self
2728}
2729
2730sub size_request {
2731 (32, 8)
2732}
2733
2734sub update {
2735 my ($self) = @_;
2736
2737 return unless $self->{visible};
2738
2739 $self->SUPER::update;
2740}
2741
2742sub _draw {
2743 my ($self) = @_;
2744
2745 return unless $::CONN;
2746
2747 my $face;
2748
2749 if ($self->{frame}) {
2750 my $anim = $::CONN->{anim}[$self->{anim}];
2751
2752 $face = $anim->[ $self->{frame} % @$anim ]
2753 if $anim && @$anim;
2754 }
2755
2756 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2757
2758 if ($tex) {
2759 glEnable GL_TEXTURE_2D;
2760 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2761 glColor 1, 1, 1, 1;
2762 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2763 glDisable GL_TEXTURE_2D;
2764 }
2765}
2766
2767sub DESTROY {
2768 my ($self) = @_;
2769
2770 $self->{timer}->cancel
2771 if $self->{timer};
2772
2773 $self->SUPER::DESTROY;
2774}
2775
2776#############################################################################
2777
2778package CFClient::UI::Inventory;
2779
2780our @ISA = CFClient::UI::ScrolledWindow::;
2781
2782sub new {
2783 my $class = shift;
2784
2785 my $self = $class->SUPER::new (
2786 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2787 @_,
2788 );
2789
2790 $self
2791}
2792
2793sub set_items {
2794 my ($self, $items) = @_;
2795
2796 $self->{scrolled}->clear;
2797 return unless $items;
2798
2799 my @items = sort {
2800 ($a->{type} <=> $b->{type})
2801 or ($a->{name} cmp $b->{name})
2802 } @$items;
2803
2804 $self->{real_items} = \@items;
2805
2806 my $row = 0;
2807 for my $item (@items) {
2808 CFClient::Item::update_widgets $item;
2809
2810 $self->{scrolled}->add (0, $row, $item->{face_widget});
2811 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2812 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2813
2814 $row++;
2815 }
2816}
2817
2818#############################################################################
2819
2820package CFClient::UI::Menu;
2821
2822our @ISA = CFClient::UI::FancyFrame::;
2823
2824use CFClient::OpenGL;
2825
2826sub new {
2827 my $class = shift;
2828
2829 my $self = $class->SUPER::new (
2830 items => [],
2831 z => 100,
2832 @_,
2833 );
2834
2835 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2836
2837 for my $item (@{ $self->{items} }) {
2838 my ($widget, $cb) = @$item;
2839
2840 # handle various types of items, only text for now
2841 if (!ref $widget) {
2842 $widget = new CFClient::UI::Label
2843 can_hover => 1,
2844 can_events => 1,
2845 text => $widget;
2846 }
2847
2848 $self->{item}{$widget} = $item;
2849
2850 $self->{vbox}->add ($widget);
2851 }
2852
2853 $self
2854}
2855
2856# popup given the event (must be a mouse button down event currently)
2857sub popup {
2858 my ($self, $ev) = @_;
2859
2860 $self->_emit ("popdown");
2861
2862 # maybe save $GRAB? must be careful about events...
2863 $GRAB = $self;
2864 $self->{button} = $ev->{button};
2865
2866 $self->show;
2867 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2868}
2869
2870sub mouse_motion {
2871 my ($self, $ev, $x, $y) = @_;
2872
2873 # TODO: should use vbox->find_widget or so
2874 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2875 $self->{hover} = $self->{item}{$HOVER};
2876}
2877
2878sub button_up {
2879 my ($self, $ev, $x, $y) = @_;
2880
2881 if ($ev->{button} == $self->{button}) {
2882 undef $GRAB;
2883 $self->hide;
2884
2885 $self->_emit ("popdown");
2886 $self->{hover}[1]->() if $self->{hover};
2887 }
2888}
2889
2890#############################################################################
2891
2892package CFClient::UI::Statusbox;
2893
2894our @ISA = CFClient::UI::VBox::;
2895
2896sub new {
2897 my $class = shift;
2898
2899 $class->SUPER::new (
2900 fontsize => 0.8,
2901 @_,
2902 )
2903}
2904
2905sub reorder {
2906 my ($self) = @_;
2907 my $NOW = time;
2908
2909 while (my ($k, $v) = each %{ $self->{item} }) {
2910 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2911 }
2912
2913 my @widgets;
2914
2915 my @items = sort {
2916 $a->{pri} <=> $b->{pri}
2917 or $b->{id} <=> $a->{id}
2918 } values %{ $self->{item} };
2919
2920 my $count = 10 + 1;
2921 for my $item (@items) {
2922 last unless --$count;
2923
2924 push @widgets, $item->{label} ||= do {
2925 # TODO: doesn't handle markup well (read as: at all)
2926 my $short = $item->{count} > 1
2927 ? "<b>$item->{count} ×</b> $item->{text}"
2928 : $item->{text};
2929
2930 for ($short) {
2931 s/^\s+//;
2932 s/\s+/ /g;
2933 }
2934
2935 new CFClient::UI::Label
2936 markup => $short,
2937 tooltip => $item->{tooltip},
2938 tooltip_font => $::FONT_PROP,
2939 tooltip_width => 0.67,
2940 fontsize => $item->{fontsize} || $self->{fontsize},
2941 max_w => $::WIDTH * 0.44,
2942 fg => $item->{fg},
2943 can_events => 1,
2944 can_hover => 1
2945 };
2946 }
2947
2948 $self->clear;
2949 $self->SUPER::add (reverse @widgets);
2950}
2951
2952sub add {
2953 my ($self, $text, %arg) = @_;
2954
2955 $text =~ s/^\s+//;
2956 $text =~ s/\s+$//;
2957
2958 return unless $text;
2959
2960 my $timeout = time + ((delete $arg{timeout}) || 60);
2961
2962 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2963
2964 if (my $item = $self->{item}{$group}) {
2965 if ($item->{text} eq $text) {
2966 $item->{count}++;
2967 } else {
2968 $item->{count} = 1;
2969 $item->{text} = $item->{tooltip} = $text;
2970 }
2971 $item->{id} = ++$self->{id};
2972 $item->{timeout} = $timeout;
2973 delete $item->{label};
2974 } else {
2975 $self->{item}{$group} = {
2976 id => ++$self->{id},
2977 text => $text,
2978 timeout => $timeout,
2979 tooltip => $text,
2980 fg => [0.8, 0.8, 0.8, 0.8],
2981 pri => 0,
2982 count => 1,
2983 %arg,
2984 };
2985 }
2986
2987 $self->reorder;
2988}
2989
2990sub reconfigure {
2991 my ($self) = @_;
2992
2993 delete $_->{label}
2994 for values %{ $self->{item} || {} };
2995
2996 $self->reorder;
2997 $self->SUPER::reconfigure;
2998}
2999
3000#############################################################################
3001
2229package CFClient::UI::Root; 3002package CFClient::UI::Root;
2230 3003
2231our @ISA = CFClient::UI::Container::; 3004our @ISA = CFClient::UI::Container::;
2232 3005
2233use CFClient::OpenGL; 3006use CFClient::OpenGL;
2234 3007
2235sub check_size { 3008sub new {
2236 my ($self) = @_; 3009 my $class = shift;
2237 3010
2238 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 3011 my $self = $class->SUPER::new (
2239} 3012 visible => 1,
3013 @_,
3014 );
2240 3015
2241sub size_request { 3016 Scalar::Util::weaken ($self->{root} = $self);
2242 ($::WIDTH, $::HEIGHT) 3017
3018 $self
2243} 3019}
2244 3020
2245sub configure { 3021sub configure {
2246 my ($self, $x, $y, $w, $h) = @_; 3022 my ($self, $x, $y, $w, $h) = @_;
2247 3023
2248 $self->SUPER::configure ($x, $y, $w, $h); 3024 $self->{w} = $w;
3025 $self->{h} = $h;
3026}
2249 3027
3028sub reconfigure {
3029 my ($self) = @_;
3030
3031 $self->SUPER::reconfigure;
3032
3033 $self->size_allocate ($self->{w}, $self->{h}, 1)
3034 if $self->{w};
3035}
3036
3037sub size_request {
3038 my ($self) = @_;
3039
3040 ($self->{w}, $self->{h})
3041}
3042
3043sub _to_pixel {
3044 my ($coord, $size, $max) = @_;
3045
3046 $coord =
3047 $coord eq "center" ? ($max - $size) * 0.5
3048 : $coord eq "max" ? $max
3049 : $coord;
3050
3051 $coord = 0 if $coord < 0;
3052 $coord = $max - $size if $coord > $max - $size;
3053
3054 int $coord + 0.5
3055}
3056
3057sub size_allocate {
3058 my ($self, $w, $h, $changed) = @_;
3059
2250 for my $child (@{$self->{children}}) { 3060 for my $child ($self->children) {
2251 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3061 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2252 3062
2253 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3063 $X = $child->{force_x} if exists $child->{force_x};
2254 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3064 $Y = $child->{force_y} if exists $child->{force_y};
3065
3066 $X = _to_pixel $X, $W, $self->{w};
3067 $Y = _to_pixel $Y, $H, $self->{h};
3068
2255 $child->configure ($X, $Y, $W,$H); 3069 $child->configure ($X, $Y, $W, $H);
2256 } 3070 }
2257} 3071}
2258 3072
2259sub _topleft { 3073sub coord2local {
2260 my ($self, $x, $y) = @_; 3074 my ($self, $x, $y) = @_;
2261 3075
2262 ($x, $y) 3076 ($x, $y)
2263} 3077}
2264 3078
3079sub coord2global {
3080 my ($self, $x, $y) = @_;
3081
3082 ($x, $y)
3083}
3084
2265sub update { 3085sub update {
2266 my ($self) = @_; 3086 my ($self) = @_;
2267 3087
2268 $self->check_size; 3088 $::WANT_REFRESH++;
2269 ::refresh ();
2270} 3089}
2271 3090
2272sub add { 3091sub add {
2273 my ($self, $child) = @_; 3092 my ($self, @children) = @_;
2274 3093
2275 # integerize window positions 3094 $_->{is_toplevel} = 1
2276 $child->{x} = int $child->{x}; 3095 for @children;
2277 $child->{y} = int $child->{y};
2278 3096
2279 $self->SUPER::add ($child); 3097 $self->SUPER::add (@children);
3098}
3099
3100sub remove {
3101 my ($self, @children) = @_;
3102
3103 $self->SUPER::remove (@children);
3104
3105 delete $self->{is_toplevel}
3106 for @children;
3107
3108 while (@children) {
3109 my $w = pop @children;
3110 push @children, $w->children;
3111 $w->set_invisible;
3112 }
2280} 3113}
2281 3114
2282sub on_refresh { 3115sub on_refresh {
2283 my ($self, $id, $cb) = @_; 3116 my ($self, $id, $cb) = @_;
2284 3117
2285 $self->{refresh_hook}{$id} = $cb; 3118 $self->{refresh_hook}{$id} = $cb;
2286} 3119}
2287 3120
3121sub on_post_alloc {
3122 my ($self, $id, $cb) = @_;
3123
3124 $self->{post_alloc_hook}{$id} = $cb;
3125}
3126
2288sub draw { 3127sub draw {
2289 my ($self) = @_; 3128 my ($self) = @_;
2290 3129
2291 while (my $rcb = delete $self->{refresh_hook}) { 3130 while ($self->{refresh_hook}) {
2292 $_->() for values %$rcb; 3131 $_->()
3132 for values %{delete $self->{refresh_hook}};
3133 }
3134
3135 if ($self->{realloc}) {
3136 my @queue;
3137
3138 while () {
3139 if ($self->{realloc}) {
3140 #TODO use array-of-depth approach
3141
3142 @queue = sort { $a->{visible} <=> $b->{visible} }
3143 @queue, values %{delete $self->{realloc}};
3144 }
3145
3146 my $widget = pop @queue || last;
3147
3148 $widget->{visible} or last; # do not resize invisible widgets
3149
3150 my ($w, $h) = $widget->size_request;
3151
3152 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3153 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3154
3155 $w = $widget->{force_w} if exists $widget->{force_w};
3156 $h = $widget->{force_h} if exists $widget->{force_h};
3157
3158 $widget->{req_w} = $w;
3159 $widget->{req_h} = $h;
3160
3161 $self->{size_alloc}{$widget} = [$widget, undef, undef];
3162
3163 push @queue, $widget->{parent}
3164 if ($self->{w} != $w || $self->{h} != $h) && $widget->{parent};
3165 }
3166 }
3167
3168 while (my $size_alloc = delete $self->{size_alloc}) {
3169 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3170 values %$size_alloc;
3171
3172 while () {
3173 my ($widget, $w, $h) = @{ pop @queue or last };
3174
3175 $w = $widget->{w} || $widget->{req_w} unless defined $w;
3176 $h = $widget->{h} || $widget->{req_h} unless defined $h;
3177
3178 $w = 0 if $w < 0;
3179 $h = 0 if $h < 0;
3180
3181 $w = int $w + 0.5;
3182 $h = int $h + 0.5;
3183
3184 my $changed = $widget->{w} != $w || $widget->{h} != $h;
3185
3186 $widget->{w} = $w;
3187 $widget->{h} = $h;
3188
3189 $widget->emit (size_allocate => $w, $h, $changed);
3190 }
3191 }
3192
3193 while ($self->{post_alloc_hook}) {
3194 $_->()
3195 for values %{delete $self->{post_alloc_hook}};
2293 } 3196 }
2294 3197
2295 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3198 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2296 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3199 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2297 glClear GL_COLOR_BUFFER_BIT; 3200 glClear GL_COLOR_BUFFER_BIT;
2298 3201
2299 glMatrixMode GL_PROJECTION; 3202 glMatrixMode GL_PROJECTION;
2300 glLoadIdentity; 3203 glLoadIdentity;
2301 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3204 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2302 glMatrixMode GL_MODELVIEW; 3205 glMatrixMode GL_MODELVIEW;
2303 glLoadIdentity; 3206 glLoadIdentity;
2304 3207
2305 $self->_draw; 3208 $self->_draw;
2306} 3209}
… …
2308############################################################################# 3211#############################################################################
2309 3212
2310package CFClient::UI; 3213package CFClient::UI;
2311 3214
2312$ROOT = new CFClient::UI::Root; 3215$ROOT = new CFClient::UI::Root;
2313$TOOLTIP = new CFClient::UI::Tooltip; 3216$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2314 3217
23151 32181
2316 3219

Diff Legend

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