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.172 by root, Tue Apr 25 09:52:04 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;
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}
15 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 (length $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_markup ($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->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 73 $FOCUS->emit (key_down => $_[0])
45 if $FOCUS; 74 if $FOCUS;
46} 75}
47 76
48sub feed_sdl_key_up_event { 77sub feed_sdl_key_up_event {
49 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 78 $FOCUS->emit (key_up => $_[0])
50 if $FOCUS; 79 if $FOCUS;
51} 80}
52 81
53sub feed_sdl_button_down_event { 82sub feed_sdl_button_down_event {
54 my ($ev) = @_; 83 my ($ev) = @_;
… …
63 check_tooltip; 92 check_tooltip;
64 } 93 }
65 94
66 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 95 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
67 96
68 if ($GRAB) { 97 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
69 ($x, $y) = $GRAB->coord2local ($x, $y); 98 if $GRAB;
70 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
71 }
72} 99}
73 100
74sub feed_sdl_button_up_event { 101sub feed_sdl_button_up_event {
75 my ($ev) = @_; 102 my ($ev) = @_;
76 my ($x, $y) = ($ev->{x}, $ev->{y}); 103 my ($x, $y) = ($ev->{x}, $ev->{y});
77 104
78 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 105 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
79 106
80 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 107 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
81 108
82 if ($GRAB) { 109 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
83 ($x, $y) = $GRAB->coord2local ($x, $y); 110 if $GRAB;
84 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
85 }
86 111
87 if (!$BUTTON_STATE) { 112 if (!$BUTTON_STATE) {
88 my $grab = $GRAB; undef $GRAB; 113 my $grab = $GRAB; undef $GRAB;
89 $grab->update if $grab; 114 $grab->update if $grab;
90 $GRAB->update if $GRAB; 115 $GRAB->update if $GRAB;
… …
106 $HOVER->update if $HOVER && $HOVER->{can_hover}; 131 $HOVER->update if $HOVER && $HOVER->{can_hover};
107 132
108 check_tooltip; 133 check_tooltip;
109 } 134 }
110 135
111 if ($HOVER) {
112 ($x, $y) = $HOVER->coord2local ($x, $y);
113 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 136 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
114 } 137 if $HOVER;
115} 138}
116 139
117# convert position array to integers 140# convert position array to integers
118sub harmonize { 141sub harmonize {
119 my ($vals) = @_; 142 my ($vals) = @_;
… …
125 $rem += $_ - $i; 148 $rem += $_ - $i;
126 $_ = $i; 149 $_ = $i;
127 } 150 }
128} 151}
129 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
130############################################################################# 194#############################################################################
131 195
132package CFClient::UI::Base; 196package CFClient::UI::Base;
133 197
134use strict; 198use strict;
… …
137 201
138sub new { 202sub new {
139 my $class = shift; 203 my $class = shift;
140 204
141 my $self = bless { 205 my $self = bless {
142 x => 0, 206 x => "center",
143 y => 0, 207 y => "center",
144 z => 0, 208 z => 0,
209 w => undef,
210 h => undef,
145 can_events => 1, 211 can_events => 1,
146 @_ 212 @_
147 }, $class; 213 }, $class;
148 214
215 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
216
149 for (keys %$self) { 217 for (keys %$self) {
150 if (/^connect_(.*)$/) { 218 if (/^on_(.*)$/) {
151 $self->connect ($1 => delete $self->{$_}); 219 $self->connect ($1 => delete $self->{$_});
152 } 220 }
153 } 221 }
154 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
155 $self 235 $self
156} 236}
157 237
158sub destroy { 238sub destroy {
159 my ($self) = @_; 239 my ($self) = @_;
… …
168 return if $self->{parent}; 248 return if $self->{parent};
169 249
170 $CFClient::UI::ROOT->add ($self); 250 $CFClient::UI::ROOT->add ($self);
171} 251}
172 252
173sub hide { 253sub set_visible {
174 my ($self) = @_; 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};
175 277
176 undef $GRAB if $GRAB == $self; 278 undef $GRAB if $GRAB == $self;
177 undef $HOVER if $HOVER == $self; 279 undef $HOVER if $HOVER == $self;
178 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
306sub hide {
307 my ($self) = @_;
308
309 $self->set_invisible;
310
179 $self->{parent}->remove ($self) 311 $self->{parent}->remove ($self)
180 if $self->{parent}; 312 if $self->{parent};
181} 313}
182 314
183sub move { 315sub move_abs {
184 my ($self, $x, $y, $z) = @_; 316 my ($self, $x, $y, $z) = @_;
185 317
186 $self->{x} = int $x; 318 $self->{x} = List::Util::max 0, int $x;
187 $self->{y} = int $y; 319 $self->{y} = List::Util::max 0, int $y;
188 $self->{z} = $z if defined $z; 320 $self->{z} = $z if defined $z;
189 321
190 $self->update; 322 $self->update;
191} 323}
192 324
193sub set_size { 325sub set_size {
194 my ($self, $w, $h) = @_; 326 my ($self, $w, $h) = @_;
195 327
196 $self->{user_w} = $w; 328 $self->{force_w} = $w;
197 $self->{user_h} = $h; 329 $self->{force_h} = $h;
198 330
199 $self->check_size; 331 $self->realloc;
200} 332}
201 333
202sub size_request { 334sub size_request {
203 require Carp; 335 require Carp;
204 Carp::confess "size_request is abstract"; 336 Carp::confess "size_request is abstract";
… …
206 338
207sub configure { 339sub configure {
208 my ($self, $x, $y, $w, $h) = @_; 340 my ($self, $x, $y, $w, $h) = @_;
209 341
210 if ($self->{aspect}) { 342 if ($self->{aspect}) {
343 my ($ow, $oh) = ($w, $h);
344
211 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 345 $w = List::Util::min $w, int $h * $self->{aspect};
212 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 346 $h = List::Util::min $h, int $w / $self->{aspect};
213 347
214 # use alignment to adjust x, y 348 # use alignment to adjust x, y
215 349
216 $x += int +($w - $w2) * 0.5; 350 $x += int 0.5 * ($ow - $w);
217 $y += int +($h - $h2) * 0.5; 351 $y += int 0.5 * ($oh - $h);
218
219 ($w, $h) = ($w2, $h2);
220 } 352 }
221 353
222 if ($self->{x} != $x || $self->{y} != $y) { 354 if ($self->{x} ne $x || $self->{y} ne $y) {
223 $self->{x} = $x; 355 $self->{x} = $x;
224 $self->{y} = $y; 356 $self->{y} = $y;
225 $self->update; 357 $self->update;
226 } 358 }
227 359
228 if ($self->{w} != $w || $self->{h} != $h) { 360 if ($self->{w} != $w || $self->{h} != $h) {
229 $self->{w} = $w; 361 return unless $self->{visible};
230 $self->{h} = $h;
231 362
232 $self->size_allocate ($w, $h); 363 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
233 $self->update;
234 } 364 }
235} 365}
236 366
237sub size_allocate { 367sub size_allocate {
238 # nothing to be done 368 # nothing to be done
… …
246 376
247 delete $self->{max_w}; $self->{max_w} = $w if $w; 377 delete $self->{max_w}; $self->{max_w} = $w if $w;
248 delete $self->{max_h}; $self->{max_h} = $h if $h; 378 delete $self->{max_h}; $self->{max_h} = $h if $h;
249} 379}
250 380
251# return top left coordinates 381sub set_tooltip {
252sub _topleft {
253 my ($self, $x, $y) = @_; 382 my ($self, $tooltip) = @_;
254 383
255 $self->{parent} 384 $tooltip =~ s/^\s+//;
256 or Carp::confess "no parent widget in _topleft\n";#d# 385 $tooltip =~ s/\s+$//;
257 386
258 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 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 }
259} 395}
260 396
261# translate global coordinates to local coordinate system 397# translate global coordinates to local coordinate system
262sub coord2local { 398sub coord2local {
263 my ($self, $x, $y) = @_; 399 my ($self, $x, $y) = @_;
264 400
265 my ($X, $Y) = $self->_topleft; 401 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
266 ($x - $X, $y - $Y)
267} 402}
268 403
269# translate local coordinates to global coordinate system 404# translate local coordinates to global coordinate system
270sub coord2global { 405sub coord2global {
271 my ($self, $x, $y) = @_; 406 my ($self, $x, $y) = @_;
272 407
273 my ($X, $Y) = $self->_topleft; 408 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
274 ($x + $X, $y + $Y)
275} 409}
276 410
277sub focus_in { 411sub focus_in {
278 my ($self) = @_; 412 my ($self) = @_;
279 413
280 return if $FOCUS == $self; 414 return if $FOCUS == $self;
281 return unless $self->{can_focus}; 415 return unless $self->{can_focus};
282 416
283 my $focus = $FOCUS; $FOCUS = $self; 417 my $focus = $FOCUS; $FOCUS = $self;
284 418
285 $self->emit (focus_in => $focus); 419 $self->_emit (focus_in => $focus);
286 420
287 $focus->update if $focus; 421 $focus->update if $focus;
288 $FOCUS->update; 422 $FOCUS->update;
289} 423}
290 424
… …
293 427
294 return unless $FOCUS == $self; 428 return unless $FOCUS == $self;
295 429
296 my $focus = $FOCUS; undef $FOCUS; 430 my $focus = $FOCUS; undef $FOCUS;
297 431
298 $self->emit (focus_out => $focus); 432 $self->_emit (focus_out => $focus);
299 433
300 $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;
301} 438}
302 439
303sub mouse_motion { } 440sub mouse_motion { }
304sub button_up { } 441sub button_up { }
305sub key_down { } 442sub key_down { }
306sub key_up { } 443sub key_up { }
307 444
308sub button_down { 445sub button_down {
309 my ($self, $ev, $x, $y) = @_; 446 my ($self, $ev, $x, $y) = @_;
310 447
311 $self->focus_in; 448 $self->focus_in;
… …
314sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 451sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
315sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 452sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
316sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 453sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
317sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 454sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
318sub 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}
319 525
320sub draw { 526sub draw {
321 my ($self) = @_; 527 my ($self) = @_;
322 528
323 return unless $self->{h} && $self->{w}; 529 return unless $self->{h} && $self->{w};
… …
340 glVertex $x , $y + $self->{h}; 546 glVertex $x , $y + $self->{h};
341 glEnd; 547 glEnd;
342 glDisable GL_BLEND; 548 glDisable GL_BLEND;
343 } 549 }
344 550
345 if ($ENV{PCLIENT_DEBUG}) { 551 if ($ENV{CFPLUS_DEBUG}) {
346 glPushMatrix; 552 glPushMatrix;
347 glColor 1, 1, 0, 1; 553 glColor 1, 1, 0, 1;
348 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 554 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
349 glBegin GL_LINE_LOOP; 555 glBegin GL_LINE_LOOP;
350 glVertex 0 , 0; 556 glVertex 0 , 0;
351 glVertex $self->{w}, 0; 557 glVertex $self->{w} - 1, 0;
352 glVertex $self->{w}, $self->{h}; 558 glVertex $self->{w} - 1, $self->{h} - 1;
353 glVertex 0 , $self->{h}; 559 glVertex 0 , $self->{h} - 1;
354 glEnd; 560 glEnd;
355 glPopMatrix; 561 glPopMatrix;
356 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 562 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
357 } 563 }
358} 564}
359 565
360sub _draw { 566sub _draw {
361 my ($self) = @_; 567 my ($self) = @_;
362 568
363 warn "no draw defined for $self\n"; 569 warn "no draw defined for $self\n";
364} 570}
365 571
366sub find_widget {
367 my ($self, $x, $y) = @_;
368
369 return () unless $self->{can_events};
370
371 return $self
372 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
373 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
374
375 ()
376}
377
378sub set_parent {
379 my ($self, $parent) = @_;
380
381 Scalar::Util::weaken ($self->{parent} = $parent);
382}
383
384sub check_size {
385 my ($self) = @_;
386
387 $self->{parent}
388 or return 1;
389
390 my ($w, $h) = $self->{user_w} && $self->{user_h}
391 ? @$self{qw(user_w user_h)}
392 : $self->size_request;
393
394 if ($w != $self->{req_w} || $h != $self->{req_h}) {
395 $self->{req_w} = $w;
396 $self->{req_h} = $h;
397
398 $self->{parent}->check_size
399 or $self->size_allocate (
400 (List::Util::max $self->{w}, $w),
401 (List::Util::max $self->{h}, $h),
402 );
403
404 1
405 } else {
406 0
407 }
408}
409
410sub update {
411 my ($self) = @_;
412
413 $self->{parent}->update
414 if $self->{parent};
415}
416
417sub connect {
418 my ($self, $signal, $cb) = @_;
419
420 push @{ $self->{signal_cb}{$signal} }, $cb;
421}
422
423sub emit {
424 my ($self, $signal, @args) = @_;
425
426 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
427}
428
429sub DESTROY { 572sub DESTROY {
430 my ($self) = @_; 573 my ($self) = @_;
431 574
575 delete $WIDGET{$self+0};
432 #$self->deactivate; 576 #$self->deactivate;
433} 577}
434 578
435############################################################################# 579#############################################################################
436 580
… …
445 my $class = shift; 589 my $class = shift;
446 590
447 # range [value, low, high, page] 591 # range [value, low, high, page]
448 592
449 $class->SUPER::new ( 593 $class->SUPER::new (
450 bg => [0, 0, 0, 0.2], 594 #bg => [0, 0, 0, 0.2],
451 active_bg => [1, 1, 1, 0.5], 595 #active_bg => [1, 1, 1, 0.5],
452 @_ 596 @_
453 ) 597 )
454} 598}
455 599
456sub _draw { 600sub _draw {
457 my ($self) = @_; 601 my ($self) = @_;
458 602
603 my $color = $FOCUS == $self && $self->{active_bg}
604 ? $self->{active_bg}
605 : $self->{bg};
606
607 if ($color && (@$color < 4 || $color->[3])) {
459 my ($w, $h) = @$self{qw(w h)}; 608 my ($w, $h) = @$self{qw(w h)};
460 609
461 glEnable GL_BLEND; 610 glEnable GL_BLEND;
462 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 611 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
463 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 612 glColor @$color;
464 613
465 glBegin GL_QUADS; 614 glBegin GL_QUADS;
466 glVertex 0 , 0; 615 glVertex 0 , 0;
467 glVertex 0 , $h; 616 glVertex 0 , $h;
468 glVertex $w, $h; 617 glVertex $w, $h;
469 glVertex $w, 0; 618 glVertex $w, 0;
470 glEnd; 619 glEnd;
471 620
472 glDisable GL_BLEND; 621 glDisable GL_BLEND;
622 }
473} 623}
474 624
475############################################################################# 625#############################################################################
476 626
477package CFClient::UI::Empty; 627package CFClient::UI::Empty;
… …
482 my ($class, %arg) = @_; 632 my ($class, %arg) = @_;
483 $class->SUPER::new (can_events => 0, %arg); 633 $class->SUPER::new (can_events => 0, %arg);
484} 634}
485 635
486sub size_request { 636sub size_request {
487 (0, 0) 637 my ($self) = @_;
638
639 ($self->{w} + 0, $self->{h} + 0)
488} 640}
489 641
490sub draw { } 642sub draw { }
491 643
492############################################################################# 644#############################################################################
… …
509 661
510 $self 662 $self
511} 663}
512 664
513sub add { 665sub add {
514 my ($self, $child) = @_; 666 my ($self, @widgets) = @_;
515 667
516 $child->set_parent ($self); 668 $_->set_parent ($self)
669 for @widgets;
517 670
518 use sort 'stable'; 671 use sort 'stable';
519 672
520 $self->{children} = [ 673 $self->{children} = [
521 sort { $a->{z} <=> $b->{z} } 674 sort { $a->{z} <=> $b->{z} }
522 @{$self->{children}}, $child 675 @{$self->{children}}, @widgets
523 ]; 676 ];
524 677
525 $child->check_size; 678 $self->realloc;
526} 679}
527 680
528sub children { 681sub children {
529 @{ $_[0]{children} } 682 @{ $_[0]{children} }
530} 683}
… …
535 delete $child->{parent}; 688 delete $child->{parent};
536 $child->hide; 689 $child->hide;
537 690
538 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 691 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
539 692
540 $self->check_size; 693 $self->realloc;
541 $self->update;
542} 694}
543 695
544sub clear { 696sub clear {
545 my ($self) = @_; 697 my ($self) = @_;
546 698
… …
549 701
550 for (@$children) { 702 for (@$children) {
551 delete $_->{parent}; 703 delete $_->{parent};
552 $_->hide; 704 $_->hide;
553 } 705 }
706
707 $self->realloc;
554} 708}
555 709
556sub find_widget { 710sub find_widget {
557 my ($self, $x, $y) = @_; 711 my ($self, $x, $y) = @_;
558 712
… …
611sub size_request { 765sub size_request {
612 $_[0]{children}[0]->size_request 766 $_[0]{children}[0]->size_request
613} 767}
614 768
615sub size_allocate { 769sub size_allocate {
616 my ($self, $w, $h) = @_; 770 my ($self, $w, $h, $changed) = @_;
617 771
618 $self->{children}[0]->configure (0, 0, $w, $h); 772 $self->{children}[0]->configure (0, 0, $w, $h);
619} 773}
620 774
621############################################################################# 775#############################################################################
… …
633} 787}
634 788
635sub update { 789sub update {
636 my ($self) = @_; 790 my ($self) = @_;
637 791
638 # we want to do this delayed... 792 $ROOT->on_post_alloc ($self => sub { $self->render_child });
639 $self->render_chld;
640 $self->SUPER::update; 793 $self->SUPER::update;
641} 794}
642 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
643sub render_chld { 808sub render_child {
644 my ($self) = @_; 809 my ($self) = @_;
645 810
646 $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 {
647 glClearColor 0, 0, 0, 1; 812 glClearColor 0, 0, 0, 0;
648 glClear GL_COLOR_BUFFER_BIT; 813 glClear GL_COLOR_BUFFER_BIT;
649 $self->child->draw; 814
815 $self->_render;
650 }; 816 };
651}
652
653sub size_allocate {
654 my ($self, $w, $h) = @_;
655
656 $self->child->configure (0, 0, $w, $h);
657
658 $self->render_chld;
659} 817}
660 818
661sub _draw { 819sub _draw {
662 my ($self) = @_; 820 my ($self) = @_;
663 821
664 my ($w, $h) = ($self->w, $self->h); 822 my ($w, $h) = ($self->w, $self->h);
665 823
666 my $tex = $self->{texture} 824 my $tex = $self->{texture}
667 or return; 825 or return;
668 826
669 glEnable GL_BLEND;
670 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
671 glEnable GL_TEXTURE_2D; 827 glEnable GL_TEXTURE_2D;
672 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;
673 830
674 $tex->draw_quad (0, 0, $w, $h); 831 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
675 832
676 glDisable GL_BLEND;
677 glDisable GL_TEXTURE_2D; 833 glDisable GL_TEXTURE_2D;
678} 834}
679 835
680############################################################################# 836#############################################################################
681 837
682package CFClient::UI::ViewPort; 838package CFClient::UI::ViewPort;
683 839
684our @ISA = CFClient::UI::Window::; 840our @ISA = CFClient::UI::Window::;
685
686sub new { die }
687
688sub size_request {
689 my ($self) = @_;
690
691 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
692 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
693
694 @$self{qw(child_w child_h)}
695}
696
697sub _draw {
698 my ($self) = @_;
699
700 $self->{children}[1]->draw;
701}
702
703
704#############################################################################
705
706package CFClient::UI::Frame;
707
708our @ISA = CFClient::UI::Bin::;
709
710use CFClient::OpenGL;
711 841
712sub new { 842sub new {
713 my $class = shift; 843 my $class = shift;
714 844
715 my $self = $class->SUPER::new ( 845 $class->SUPER::new (
716 bg => [1, 1, 1, 1], 846 scroll_x => 0,
717 border_bg => [1, 1, 1, 1], 847 scroll_y => 1,
718 border => 0.8,
719 @_ 848 @_,
720 ); 849 )
721
722 $self
723} 850}
724 851
725sub _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 {
726 my ($self) = @_; 874 my ($self, $x, $y) = @_;
727 875
728 my ($w, $h) = ($self->{w}, $self->{h}); 876 $self->{view_x} = int $x;
877 $self->{view_y} = int $y;
729 878
730 glEnable GL_BLEND; 879 $self->update;
731 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 880}
732 glEnable GL_TEXTURE_2D;
733 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
734 881
735# glBegin GL_QUADS; 882# hmm, this does not work for topleft of $self... but we should not ask for that
736# glColor 0, 0, 0, 0; 883sub coord2local {
737# glVertex 0 , 0; 884 my ($self, $x, $y) = @_;
738# glVertex 0 , $h;
739# glVertex $w, $h;
740# glVertex $w, 0;
741# glEnd;
742 885
886 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
887}
743 888
744 $self->child->draw; 889sub coord2global {
745 glDisable GL_BLEND; 890 my ($self, $x, $y) = @_;
746 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;
747} 916}
748 917
749############################################################################# 918#############################################################################
750 919
751package CFClient::UI::FancyFrame; 920package CFClient::UI::ScrolledWindow;
752 921
753our @ISA = CFClient::UI::Bin::; 922our @ISA = CFClient::UI::HBox::;
754
755use CFClient::OpenGL;
756
757my @tex =
758 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
759 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
760 923
761sub new { 924sub new {
762 my $class = shift; 925 my $class = shift;
763 926
764 # 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;
765 1030
766 my $self = $class->SUPER::new ( 1031 my $self = $class->SUPER::new (
767 bg => [1, 1, 1, 1], 1032 bg => [1, 1, 1, 1],
768 border_bg => [1, 1, 1, 1], 1033 border_bg => [1, 1, 1, 1],
769 border => 0.8, 1034 border => 0.6,
770 can_events => 1, 1035 can_events => 1,
1036 min_w => 16,
1037 min_h => 16,
771 @_ 1038 @_
772 ); 1039 );
773 1040
774 $self->{title} &&= new CFClient::UI::Label 1041 $self->{title} &&= new CFClient::UI::Label
775 align => 0, 1042 align => 0,
776 valign => 1, 1043 valign => 1,
777 text => $self->{title}, 1044 text => $self->{title},
778 fontsize => 1; 1045 fontsize => $self->{border};
779 1046
780 $self 1047 $self
781} 1048}
782 1049
783sub border { 1050sub border {
… …
794 $h + $self->border * 2, 1061 $h + $self->border * 2,
795 ) 1062 )
796} 1063}
797 1064
798sub size_allocate { 1065sub size_allocate {
799 my ($self, $w, $h) = @_; 1066 my ($self, $w, $h, $changed) = @_;
1067
1068 return unless $changed;
800 1069
801 $h -= List::Util::max 0, $self->border * 2; 1070 $h -= List::Util::max 0, $self->border * 2;
802 $w -= List::Util::max 0, $self->border * 2; 1071 $w -= List::Util::max 0, $self->border * 2;
803 1072
804 $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)
805 if $self->{title}; 1074 if $self->{title};
806 1075
807 $self->child->configure ($self->border, $self->border, $w, $h); 1076 $self->child->configure ($self->border, $self->border, $w, $h);
808} 1077}
809 1078
810sub button_down { 1079sub button_down {
811 my ($self, $ev, $x, $y) = @_; 1080 my ($self, $ev, $x, $y) = @_;
812 1081
1082 my ($w, $h) = @$self{qw(w h)};
813 my $border = $self->border; 1083 my $border = $self->border;
814 1084
815 if ($x < $self->{w} && $x >= $self->{w} - $border 1085 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
816 && $y < $self->{h} && $y >= $self->{h} - $border) { 1086 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
817 1087
1088 if ($lr & $td) {
1089 my ($wx, $wy) = ($self->{x}, $self->{y});
818 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1090 my ($ox, $oy) = ($ev->{x}, $ev->{y});
819 my ($bw, $bh) = ($self->{w}, $self->{h}); 1091 my ($bw, $bh) = ($self->{w}, $self->{h});
820 1092
1093 my $mx = $x < $border;
1094 my $my = $y < $border;
1095
821 $self->{motion} = sub { 1096 $self->{motion} = sub {
822 my ($ev, $x, $y) = @_; 1097 my ($ev, $x, $y) = @_;
823 1098
824 ($x, $y) = ($ev->{x}, $ev->{y}); 1099 my $dx = $ev->{x} - $ox;
1100 my $dy = $ev->{y} - $oy;
825 1101
826 $self->{user_w} = $bw + $x - $ox; 1102 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
827 $self->{user_h} = $bh + $y - $oy; 1103 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
828 $self->check_size; 1104
1105 $self->realloc;
1106 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
829 }; 1107 };
830 1108
831 } elsif ($x >= 0 && $x < $self->{w} 1109 } elsif ($lr ^ $td) {
832 && $y >= 0 && $y < $border) {
833
834 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1110 my ($ox, $oy) = ($ev->{x}, $ev->{y});
835 my ($bx, $by) = ($self->{x}, $self->{y}); 1111 my ($bx, $by) = ($self->{x}, $self->{y});
836 1112
837 $self->{motion} = sub { 1113 $self->{motion} = sub {
838 my ($ev, $x, $y) = @_; 1114 my ($ev, $x, $y) = @_;
839 1115
840 ($x, $y) = ($ev->{x}, $ev->{y}); 1116 ($x, $y) = ($ev->{x}, $ev->{y});
841 1117
842 $self->move ($bx + $x - $ox, $by + $y - $oy); 1118 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
843 $self->update;
844 }; 1119 };
845 } 1120 }
846} 1121}
847 1122
848sub button_up { 1123sub button_up {
… …
861 my ($self) = @_; 1136 my ($self) = @_;
862 1137
863 my ($w, $h ) = ($self->{w}, $self->{h}); 1138 my ($w, $h ) = ($self->{w}, $self->{h});
864 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1139 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
865 1140
866 glEnable GL_BLEND;
867 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
868 glEnable GL_TEXTURE_2D; 1141 glEnable GL_TEXTURE_2D;
869 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1142 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
870 1143
871 my $border = $self->border; 1144 my $border = $self->border;
872 1145
873 glColor @{ $self->{border_bg} }; 1146 glColor @{ $self->{border_bg} };
874 $tex[1]->draw_quad (0, 0, $w, $border); 1147 $border[0]->draw_quad_alpha (0, 0, $w, $border);
875 $tex[3]->draw_quad (0, $border, $border, $ch); 1148 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
876 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1149 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
877 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1150 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
878 1151
879 my $bg = $tex[0]; 1152 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1153 glColor @{ $self->{bg} };
880 1154
881 # TODO: repeat texture not scale 1155 # TODO: repeat texture not scale
882 my $rep_x = $cw / $bg->{w}; 1156 # solve this better(?)
883 my $rep_y = $ch / $bg->{h}; 1157 $bg->{s} = $cw / $bg->{w};
884 1158 $bg->{t} = $ch / $bg->{h};
885 glColor @{ $self->{bg} };
886
887 $bg->{s} = $rep_x;
888 $bg->{t} = $rep_y;
889 $bg->{wrap_mode} = 1;
890 $bg->draw_quad ($border, $border, $cw, $ch); 1159 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1160 }
891 1161
892 glDisable GL_TEXTURE_2D; 1162 glDisable GL_TEXTURE_2D;
893 glDisable GL_BLEND;
894 1163
895 $self->{title}->draw if $self->{title}; 1164 $self->{title}->draw if $self->{title};
1165
896 $self->child->draw; 1166 $self->child->draw;
897} 1167}
898 1168
899############################################################################# 1169#############################################################################
900 1170
… …
909sub new { 1179sub new {
910 my $class = shift; 1180 my $class = shift;
911 1181
912 $class->SUPER::new ( 1182 $class->SUPER::new (
913 col_expand => [], 1183 col_expand => [],
914 @_ 1184 @_,
915 ) 1185 )
1186}
1187
1188sub children {
1189 grep $_, map @$_, grep $_, @{ $_[0]{children} }
916} 1190}
917 1191
918sub add { 1192sub add {
919 my ($self, $x, $y, $child) = @_; 1193 my ($self, $x, $y, $child) = @_;
920 1194
921 $child->set_parent ($self); 1195 $child->set_parent ($self);
922 $self->{children}[$y][$x] = $child; 1196 $self->{children}[$y][$x] = $child;
923 1197
924 $child->check_size; 1198 $self->realloc;
925} 1199}
926 1200
927sub children {
928 grep $_, map @$_, grep $_, @{ $_[0]{children} }
929}
930
931# 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?
932sub clear { 1202sub clear {
933 my ($self) = @_; 1203 my ($self) = @_;
934 1204
935 my @children = $self->children; 1205 my @children = $self->children;
936 delete $self->{children}; 1206 delete $self->{children};
… …
938 for (@children) { 1208 for (@children) {
939 delete $_->{parent}; 1209 delete $_->{parent};
940 $_->hide; 1210 $_->hide;
941 } 1211 }
942 1212
943 $self->update; 1213 $self->realloc;
944} 1214}
945 1215
946sub get_wh { 1216sub get_wh {
947 my ($self) = @_; 1217 my ($self) = @_;
948 1218
… …
975 (sum @$hs), 1245 (sum @$hs),
976 ) 1246 )
977} 1247}
978 1248
979sub size_allocate { 1249sub size_allocate {
980 my ($self, $w, $h) = @_; 1250 my ($self, $w, $h, $changed) = @_;
981 1251
982 my ($ws, $hs) = $self->get_wh; 1252 my ($ws, $hs) = $self->get_wh;
983 1253
984 my $req_w = sum @$ws; 1254 my $req_w = (sum @$ws) || 1;
985 my $req_h = sum @$hs; 1255 my $req_h = (sum @$hs) || 1;
986 1256
987 # TODO: nicer code && do row_expand 1257 # TODO: nicer code && do row_expand
988 my @col_expand = @{$self->{col_expand}}; 1258 my @col_expand = @{$self->{col_expand}};
989 @col_expand = (1) x @$ws unless @col_expand; 1259 @col_expand = (1) x @$ws unless @col_expand;
990 my $col_expand = (sum @col_expand) || 1; 1260 my $col_expand = (sum @col_expand) || 1;
… …
1044 } 1314 }
1045} 1315}
1046 1316
1047############################################################################# 1317#############################################################################
1048 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
1049package CFClient::UI::HBox; 1379package CFClient::UI::HBox;
1050 1380
1051# TODO: wrap into common Box base class
1052
1053our @ISA = CFClient::UI::Container::; 1381our @ISA = CFClient::UI::Box::;
1054 1382
1055sub size_request { 1383sub new {
1056 my ($self) = @_; 1384 my $class = shift;
1057 1385
1058 my @alloc = map [$_->size_request], @{$self->{children}}; 1386 $class->SUPER::new (
1059 1387 vertical => 0,
1060 ( 1388 @_,
1061 (List::Util::sum map $_->[0], @alloc),
1062 (List::Util::max map $_->[1], @alloc),
1063 ) 1389 )
1064} 1390}
1065 1391
1066sub size_allocate {
1067 my ($self, $w, $h) = @_;
1068
1069 ($h, $w) = ($w, $h);
1070
1071 my $children = $self->{children};
1072
1073 my @h = map $_->{req_w}, @$children;
1074
1075 my $req_h = List::Util::sum @h;
1076
1077 if ($req_h > $h) {
1078 # ah well, not enough space
1079 $_ *= $h / $req_h for @h;
1080 } else {
1081 my $exp = List::Util::sum map $_->{expand}, @$children;
1082 $exp ||= 1;
1083
1084 for (0 .. $#$children) {
1085 my $child = $children->[$_];
1086
1087 my $alloc_h = $h[$_];
1088 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1089 $h[$_] = $alloc_h;
1090 }
1091 }
1092
1093 CFClient::UI::harmonize \@h;
1094
1095 my $y = 0;
1096 for (0 .. $#$children) {
1097 my $child = $children->[$_];
1098 my $h = $h[$_];
1099 $child->configure ($y, 0, $h, $w);
1100
1101 $y += $h;
1102 }
1103
1104 1
1105}
1106
1107############################################################################# 1392#############################################################################
1108 1393
1109package CFClient::UI::VBox; 1394package CFClient::UI::VBox;
1110 1395
1111# TODO: wrap into common Box base class
1112
1113our @ISA = CFClient::UI::Container::; 1396our @ISA = CFClient::UI::Box::;
1114 1397
1115sub size_request { 1398sub new {
1116 my ($self) = @_; 1399 my $class = shift;
1117 1400
1118 my @alloc = map [$_->size_request], @{$self->{children}}; 1401 $class->SUPER::new (
1119 1402 vertical => 1,
1120 ( 1403 @_,
1121 (List::Util::max map $_->[0], @alloc),
1122 (List::Util::sum map $_->[1], @alloc),
1123 ) 1404 )
1124} 1405}
1125 1406
1126sub size_allocate {
1127 my ($self, $w, $h) = @_;
1128
1129 my $children = $self->{children};
1130
1131 my @h = map $_->{req_h}, @$children;
1132
1133 my $req_h = List::Util::sum @h;
1134
1135 if ($req_h > $h) {
1136 # ah well, not enough space
1137 $_ *= $h / $req_h for @h;
1138 } else {
1139 my $exp = List::Util::sum map $_->{expand}, @$children;
1140 $exp ||= 1;
1141
1142 for (0 .. $#$children) {
1143 my $child = $children->[$_];
1144
1145 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1146 }
1147 }
1148
1149 CFClient::UI::harmonize \@h;
1150
1151 my $y = 0;
1152 for (0 .. $#$children) {
1153 my $child = $children->[$_];
1154 my $h = $h[$_];
1155 $child->configure (0, $y, $w, $h);
1156
1157 $y += $h;
1158 }
1159
1160 1
1161}
1162
1163############################################################################# 1407#############################################################################
1164 1408
1165package CFClient::UI::Label; 1409package CFClient::UI::Label;
1166 1410
1167our @ISA = CFClient::UI::Base::; 1411our @ISA = CFClient::UI::DrawBG::;
1168 1412
1169use CFClient::OpenGL; 1413use CFClient::OpenGL;
1170 1414
1171sub new { 1415sub new {
1172 my ($class, %arg) = @_; 1416 my ($class, %arg) = @_;
1173 1417
1174 my $self = $class->SUPER::new ( 1418 my $self = $class->SUPER::new (
1175 fg => [1, 1, 1], 1419 fg => [1, 1, 1],
1420 #bg => none
1421 #active_bg => none
1176 #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),
1177 fontsize => 1, 1428 fontsize => 1,
1178 text => "",
1179 align => -1, 1429 align => -1,
1180 valign => -1, 1430 valign => -1,
1181 padding => 2, 1431 padding_x => 2,
1182 layout => new CFClient::Layout, 1432 padding_y => 2,
1183 can_events => 0, 1433 can_events => 0,
1184 %arg 1434 %arg
1185 ); 1435 );
1186 1436
1187 if (exists $self->{template}) { 1437 if (exists $self->{template}) {
1188 my $layout = new CFClient::Layout; 1438 my $layout = new CFClient::Layout;
1189 $layout->set_text (delete $self->{template}); 1439 $layout->set_text (delete $self->{template});
1190 $self->{template} = $layout; 1440 $self->{template} = $layout;
1191 } 1441 }
1192 1442
1193 $self->set_text (delete $self->{text}) if exists $self->{text}; 1443 if (exists $self->{markup}) {
1194 $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 }
1195 1448
1196 $self 1449 $self
1197} 1450}
1198 1451
1199sub escape { 1452sub escape($) {
1200 local $_ = $_[1]; 1453 local $_ = $_[0];
1201 1454
1202 s/&/&amp;/g; 1455 s/&/&amp;/g;
1203 s/>/&gt;/g; 1456 s/>/&gt;/g;
1204 s/</&lt;/g; 1457 s/</&lt;/g;
1205 1458
1206 $_[1] 1459 $_
1460}
1461
1462sub update {
1463 my ($self) = @_;
1464
1465 delete $self->{texture};
1466 $self->SUPER::update;
1207} 1467}
1208 1468
1209sub set_text { 1469sub set_text {
1210 my ($self, $text) = @_; 1470 my ($self, $text) = @_;
1211 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;
1212 $self->{layout}->set_text ($text); 1476 $self->{layout}->set_text ($text);
1213 1477
1214 delete $self->{texture}; 1478 $self->realloc;
1215 $self->check_size;
1216 $self->update; 1479 $self->update;
1217} 1480}
1218 1481
1219sub set_markup { 1482sub set_markup {
1220 my ($self, $markup) = @_; 1483 my ($self, $markup) = @_;
1221 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;
1222 $self->{layout}->set_markup ($markup); 1491 $self->{layout}->set_markup ($markup);
1223 1492
1224 delete $self->{texture}; 1493 $self->realloc;
1225 $self->check_size;
1226 $self->update; 1494 $self->update;
1227} 1495}
1228 1496
1229sub size_request { 1497sub size_request {
1230 my ($self) = @_; 1498 my ($self) = @_;
1231 1499
1232 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1500 $self->{layout}->set_font ($self->{font}) if $self->{font};
1233 $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});
1234 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1504 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1235 1505
1236 my ($w, $h) = $self->{layout}->size; 1506 my ($w, $h) = $self->{layout}->size;
1237 1507
1238 if (exists $self->{template}) { 1508 if (exists $self->{template}) {
… …
1243 1513
1244 $w = List::Util::max $w, $w2; 1514 $w = List::Util::max $w, $w2;
1245 $h = List::Util::max $h, $h2; 1515 $h = List::Util::max $h, $h2;
1246 } 1516 }
1247 1517
1248 ( 1518 ($w, $h)
1249 $w + $self->{padding} * 2,
1250 $h + $self->{padding} * 2,
1251 )
1252} 1519}
1253 1520
1254sub size_allocate { 1521sub size_allocate {
1255 my ($self, $w, $h) = @_; 1522 my ($self, $w, $h, $changed) = @_;
1256 1523
1257 delete $self->{texture}; 1524 delete $self->{texture}
1525 if $changed;
1258} 1526}
1259 1527
1260sub set_fontsize { 1528sub set_fontsize {
1261 my ($self, $fontsize) = @_; 1529 my ($self, $fontsize) = @_;
1262 1530
1263 $self->{fontsize} = $fontsize; 1531 $self->{fontsize} = $fontsize;
1264 delete $self->{texture}; 1532 delete $self->{texture};
1265 $self->check_size; 1533
1266 $self->update; 1534 $self->realloc;
1267} 1535}
1268 1536
1269sub _draw { 1537sub _draw {
1270 my ($self) = @_; 1538 my ($self) = @_;
1271 1539
1540 $self->SUPER::_draw; # draw background, if applicable
1541
1272 my $tex = $self->{texture} ||= do { 1542 my $tex = $self->{texture} ||= do {
1543 $self->{layout}->set_foreground (@{$self->{fg}});
1273 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1544 $self->{layout}->set_font ($self->{font}) if $self->{font};
1274 $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});
1275 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1548 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1549
1276 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
1277 }; 1561 };
1278 1562
1279 glEnable GL_BLEND;
1280 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1281 glEnable GL_TEXTURE_2D; 1563 glEnable GL_TEXTURE_2D;
1282 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1564 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1283 1565
1566 if ($tex->{format} == GL_ALPHA) {
1284 glColor @{$self->{fg}}; 1567 glColor @{$self->{fg}};
1285
1286 $self->{ox} = int (
1287 $self->{align} < 0 ? $self->{padding}
1288 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1289 : ($self->{w} - $tex->{w}) * 0.5
1290 );
1291
1292 $self->{oy} = int (
1293 $self->{valign} < 0 ? $self->{padding}
1294 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1295 : ($self->{h} - $tex->{h}) * 0.5
1296 );
1297
1298 $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 }
1299 1572
1300 glDisable GL_TEXTURE_2D; 1573 glDisable GL_TEXTURE_2D;
1301 glDisable GL_BLEND;
1302} 1574}
1303 1575
1304############################################################################# 1576#############################################################################
1305 1577
1306package CFClient::UI::EntryBase; 1578package CFClient::UI::EntryBase;
… …
1319 active_fg => [0, 0, 0], 1591 active_fg => [0, 0, 0],
1320 can_hover => 1, 1592 can_hover => 1,
1321 can_focus => 1, 1593 can_focus => 1,
1322 valign => 0, 1594 valign => 0,
1323 can_events => 1, 1595 can_events => 1,
1596 #text => ...
1324 @_ 1597 @_
1325 ) 1598 )
1326} 1599}
1327 1600
1328sub _set_text { 1601sub _set_text {
… …
1338 $self->{text} = $text; 1611 $self->{text} = $text;
1339 1612
1340 $text =~ s/./*/g if $self->{hidden}; 1613 $text =~ s/./*/g if $self->{hidden};
1341 $self->{layout}->set_text ("$text "); 1614 $self->{layout}->set_text ("$text ");
1342 1615
1343 $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;
1344} 1626}
1345 1627
1346sub get_text { 1628sub get_text {
1347 $_[0]{text} 1629 $_[0]{text}
1348} 1630}
… …
1351 my ($self) = @_; 1633 my ($self) = @_;
1352 1634
1353 my ($w, $h) = $self->SUPER::size_request; 1635 my ($w, $h) = $self->SUPER::size_request;
1354 1636
1355 ($w + 1, $h) # add 1 for cursor 1637 ($w + 1, $h) # add 1 for cursor
1356}
1357
1358sub size_allocate {
1359 my ($self, $w, $h) = @_;
1360
1361 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1362}
1363
1364sub set_text {
1365 my ($self, $text) = @_;
1366
1367 $self->{cursor} = length $text;
1368 $self->_set_text ($text);
1369 $self->update;
1370} 1638}
1371 1639
1372sub key_down { 1640sub key_down {
1373 my ($self, $ev) = @_; 1641 my ($self, $ev) = @_;
1374 1642
… …
1376 my $sym = $ev->{sym}; 1644 my $sym = $ev->{sym};
1377 my $uni = $ev->{unicode}; 1645 my $uni = $ev->{unicode};
1378 1646
1379 my $text = $self->get_text; 1647 my $text = $self->get_text;
1380 1648
1381 if ($sym == 8) { 1649 if ($uni == 8) {
1382 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1650 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1383 } elsif ($sym == 127) { 1651 } elsif ($uni == 127) {
1384 substr $text, $self->{cursor}, 1, ""; 1652 substr $text, $self->{cursor}, 1, "";
1385 } elsif ($sym == CFClient::SDLK_LEFT) { 1653 } elsif ($sym == CFClient::SDLK_LEFT) {
1386 --$self->{cursor} if $self->{cursor}; 1654 --$self->{cursor} if $self->{cursor};
1387 } elsif ($sym == CFClient::SDLK_RIGHT) { 1655 } elsif ($sym == CFClient::SDLK_RIGHT) {
1388 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1656 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1389 } elsif ($sym == CFClient::SDLK_HOME) { 1657 } elsif ($sym == CFClient::SDLK_HOME) {
1390 $self->{cursor} = 0; 1658 $self->{cursor} = 0;
1391 } elsif ($sym == CFClient::SDLK_END) { 1659 } elsif ($sym == CFClient::SDLK_END) {
1392 $self->{cursor} = length $text; 1660 $self->{cursor} = length $text;
1393 } elsif ($sym == 27) { 1661 } elsif ($uni == 27) {
1394 $self->emit ('escape'); 1662 $self->_emit ('escape');
1395 } elsif ($uni) { 1663 } elsif ($uni) {
1396 substr $text, $self->{cursor}++, 0, chr $uni; 1664 substr $text, $self->{cursor}++, 0, chr $uni;
1397 } 1665 }
1398 1666
1399 $self->_set_text ($text); 1667 $self->_set_text ($text);
1400 $self->update; 1668
1669 $self->realloc;
1401} 1670}
1402 1671
1403sub focus_in { 1672sub focus_in {
1404 my ($self) = @_; 1673 my ($self) = @_;
1405 1674
… …
1485 if ($sym == 13) { 1754 if ($sym == 13) {
1486 unshift @{$self->{history}}, 1755 unshift @{$self->{history}},
1487 my $txt = $self->get_text; 1756 my $txt = $self->get_text;
1488 $self->{history_pointer} = -1; 1757 $self->{history_pointer} = -1;
1489 $self->{history_saveback} = ''; 1758 $self->{history_saveback} = '';
1490 $self->emit (activate => $txt); 1759 $self->_emit (activate => $txt);
1491 $self->update; 1760 $self->update;
1492 1761
1493 } elsif ($sym == CFClient::SDLK_UP) { 1762 } elsif ($sym == CFClient::SDLK_UP) {
1494 if ($self->{history_pointer} < 0) { 1763 if ($self->{history_pointer} < 0) {
1495 $self->{history_saveback} = $self->get_text; 1764 $self->{history_saveback} = $self->get_text;
… …
1532 1801
1533sub new { 1802sub new {
1534 my $class = shift; 1803 my $class = shift;
1535 1804
1536 $class->SUPER::new ( 1805 $class->SUPER::new (
1537 padding => 4, 1806 padding_x => 4,
1807 padding_y => 4,
1538 fg => [1, 1, 1], 1808 fg => [1, 1, 1],
1539 bg => [1, 1, 1, 0.2],
1540 active_fg => [0, 0, 1], 1809 active_fg => [0, 0, 1],
1541 can_hover => 1, 1810 can_hover => 1,
1542 align => 0, 1811 align => 0,
1543 valign => 0, 1812 valign => 0,
1544 can_events => 1, 1813 can_events => 1,
1545 @_ 1814 @_
1546 ) 1815 )
1547} 1816}
1548 1817
1818sub activate { }
1819
1549sub button_up { 1820sub button_up {
1550 my ($self, $ev, $x, $y) = @_; 1821 my ($self, $ev, $x, $y) = @_;
1551 1822
1823 $self->emit ("activate")
1552 if ($x >= 0 && $x < $self->{w} 1824 if $x >= 0 && $x < $self->{w}
1553 && $y >= 0 && $y < $self->{h}) { 1825 && $y >= 0 && $y < $self->{h};
1554 $self->emit ("activate");
1555 }
1556} 1826}
1557 1827
1558sub _draw { 1828sub _draw {
1559 my ($self) = @_; 1829 my ($self) = @_;
1560 1830
… …
1562 1832
1563 if ($GRAB == $self) { 1833 if ($GRAB == $self) {
1564 $self->{fg} = $self->{active_fg}; 1834 $self->{fg} = $self->{active_fg};
1565 } 1835 }
1566 1836
1567 glEnable GL_BLEND;
1568 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1569 glEnable GL_TEXTURE_2D; 1837 glEnable GL_TEXTURE_2D;
1570 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1838 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1571 glColor 0, 0, 0, 1; 1839 glColor 0, 0, 0, 1;
1572 1840
1573 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1841 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1574 1842
1575 glDisable GL_TEXTURE_2D; 1843 glDisable GL_TEXTURE_2D;
1576 glDisable GL_BLEND;
1577 1844
1578 $self->SUPER::_draw; 1845 $self->SUPER::_draw;
1579} 1846}
1580 1847
1581############################################################################# 1848#############################################################################
… …
1592 1859
1593sub new { 1860sub new {
1594 my $class = shift; 1861 my $class = shift;
1595 1862
1596 $class->SUPER::new ( 1863 $class->SUPER::new (
1597 padding => 2, 1864 padding_x => 2,
1865 padding_y => 2,
1598 fg => [1, 1, 1], 1866 fg => [1, 1, 1],
1599 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],
1600 state => 0, 1870 state => 0,
1601 can_hover => 1, 1871 can_hover => 1,
1602 @_ 1872 @_
1603 ) 1873 )
1604} 1874}
1605 1875
1606sub size_request { 1876sub size_request {
1607 my ($self) = @_; 1877 my ($self) = @_;
1608 1878
1609 ($self->{padding} * 2 + 6) x 2 1879 (6) x 2
1610} 1880}
1611 1881
1612sub button_down { 1882sub button_down {
1613 my ($self, $ev, $x, $y) = @_; 1883 my ($self, $ev, $x, $y) = @_;
1614 1884
1615 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1885 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1616 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1886 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1617 $self->{state} = !$self->{state}; 1887 $self->{state} = !$self->{state};
1618 $self->emit (changed => $self->{state}); 1888 $self->_emit (changed => $self->{state});
1619 } 1889 }
1620} 1890}
1621 1891
1622sub _draw { 1892sub _draw {
1623 my ($self) = @_; 1893 my ($self) = @_;
1624 1894
1625 $self->SUPER::_draw; 1895 $self->SUPER::_draw;
1626 1896
1627 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1897 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1628 1898
1629 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;
1630 1902
1631 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1903 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1632 1904
1633 glEnable GL_BLEND; 1905 my $tex = $self->{state} ? $tex[1] : $tex[0];
1906
1634 glEnable GL_TEXTURE_2D; 1907 glEnable GL_TEXTURE_2D;
1635 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1636
1637 my $tex = $self->{state} ? $tex[1] : $tex[0];
1638
1639 $tex->draw_quad (0, 0, $s, $s); 1908 $tex->draw_quad_alpha (0, 0, $s, $s);
1640
1641 glDisable GL_TEXTURE_2D; 1909 glDisable GL_TEXTURE_2D;
1642 glDisable GL_BLEND;
1643} 1910}
1644 1911
1645############################################################################# 1912#############################################################################
1646 1913
1647package CFClient::UI::Image; 1914package CFClient::UI::Image;
… …
1690 glTranslate 0, -$self->{w}, 0; 1957 glTranslate 0, -$self->{w}, 0;
1691 1958
1692 ($w, $h) = ($h, $w); 1959 ($w, $h) = ($h, $w);
1693 } 1960 }
1694 1961
1695 glEnable GL_BLEND;
1696 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1697 glEnable GL_TEXTURE_2D; 1962 glEnable GL_TEXTURE_2D;
1698 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1963 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1699 1964
1700 $tex->draw_quad (0, 0, $w, $h); 1965 $tex->draw_quad_alpha (0, 0, $w, $h);
1701 1966
1702 glDisable GL_BLEND;
1703 glDisable GL_TEXTURE_2D; 1967 glDisable GL_TEXTURE_2D;
1704} 1968}
1705 1969
1706############################################################################# 1970#############################################################################
1707 1971
… …
1755} 2019}
1756 2020
1757sub set_max { 2021sub set_max {
1758 my ($self, $max) = @_; 2022 my ($self, $max) = @_;
1759 2023
2024 return if $self->{max_val} == $max;
2025
1760 $self->{max_val} = $max; 2026 $self->{max_val} = $max;
2027 $self->update;
1761} 2028}
1762 2029
1763sub set_value { 2030sub set_value {
1764 my ($self, $val, $max) = @_; 2031 my ($self, $val, $max) = @_;
1765 2032
1766 $self->set_max ($max) 2033 $self->set_max ($max)
1767 if defined $max; 2034 if defined $max;
1768 2035
1769 $max = $self->{max_val}; 2036 return if $self->{val} == $val;
2037
1770 $self->{val} = $val; 2038 $self->{val} = $val;
1771
1772 $self->update; 2039 $self->update;
1773} 2040}
1774 2041
1775sub _draw { 2042sub _draw {
1776 my ($self) = @_; 2043 my ($self) = @_;
… …
1859 2126
1860 $self->{value}->set_fontsize ($fsize); 2127 $self->{value}->set_fontsize ($fsize);
1861 $self->{max} ->set_fontsize ($fsize); 2128 $self->{max} ->set_fontsize ($fsize);
1862} 2129}
1863 2130
2131sub set_max {
2132 my ($self, $max) = @_;
2133
2134 $self->{gauge}->set_max ($max);
2135 $self->{max}->set_text ($max);
2136}
2137
1864sub set_value { 2138sub set_value {
1865 my ($self, $val, $max) = @_; 2139 my ($self, $val, $max) = @_;
1866 2140
1867 $self->set_max ($max) 2141 $self->set_max ($max)
1868 if defined $max; 2142 if defined $max;
1869 2143
1870 $self->{gauge}->set_value ($val, $max); 2144 $self->{gauge}->set_value ($val, $max);
1871 $self->{value}->set_text ($val); 2145 $self->{value}->set_text ($val);
1872}
1873
1874sub set_max {
1875 my ($self, $max) = @_;
1876
1877 $self->{gauge}->set_max ($max);
1878 $self->{max}->set_text ($max);
1879} 2146}
1880 2147
1881############################################################################# 2148#############################################################################
1882 2149
1883package CFClient::UI::Slider; 2150package CFClient::UI::Slider;
… …
1893 qw(s1_slider.png s1_slider_bg.png); 2160 qw(s1_slider.png s1_slider_bg.png);
1894 2161
1895sub new { 2162sub new {
1896 my $class = shift; 2163 my $class = shift;
1897 2164
1898 # range [value, low, high, page] 2165 # range [value, low, high, page, unit]
1899 2166
1900 # TODO: 0-width page 2167 # TODO: 0-width page
1901 # TODO: req_w/h are wrong with vertical 2168 # TODO: req_w/h are wrong with vertical
1902 # TODO: calculations are off 2169 # TODO: calculations are off
1903 my $self = $class->SUPER::new ( 2170 my $self = $class->SUPER::new (
1904 fg => [1, 1, 1], 2171 fg => [1, 1, 1],
1905 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],
1906 range => [0, 0, 100, 10], 2175 range => [0, 0, 100, 10, 0],
1907 req_w => 20, 2176 min_w => $::WIDTH / 80,
1908 req_h => 20, 2177 min_h => $::WIDTH / 80,
1909 vertical => 0, 2178 vertical => 0,
1910 can_hover => 1, 2179 can_hover => 1,
1911 inner_pad => 5, 2180 inner_pad => 0.02,
1912 @_ 2181 @_
1913 ); 2182 );
1914 2183
2184 $self->set_value ($self->{range}[0]);
2185 $self->update;
2186
1915 $self 2187 $self
1916} 2188}
1917 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
1918sub size_request { 2224sub size_request {
1919 my ($self) = @_; 2225 my ($self) = @_;
1920 2226
1921 my $w = $self->{req_w}; 2227 ($self->{req_w}, $self->{req_h})
1922 my $h = $self->{req_h};
1923
1924 $self->{vertical} ? ($h, $w) : ($w, $h)
1925} 2228}
1926 2229
1927sub button_down { 2230sub button_down {
1928 my ($self, $ev, $x, $y) = @_; 2231 my ($self, $ev, $x, $y) = @_;
1929 2232
1930 $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
1931 $self->mouse_motion ($ev, $x, $y); 2237 $self->mouse_motion ($ev, $x, $y);
1932} 2238}
1933 2239
1934sub mouse_motion { 2240sub mouse_motion {
1935 my ($self, $ev, $x, $y) = @_; 2241 my ($self, $ev, $x, $y) = @_;
1936 2242
1937 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
1938 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2260 my ($value, $lo, $hi, $page) = @{$self->{range}};
2261 my $range = ($hi - $page - $lo) || 1e-100;
1939 2262
1940 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2263 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1941 2264
1942 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2265 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1943 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2266 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1944 2267
1945 $x -= $inner_pad_px; # substract the padding 2268 $value = ($value - $lo) / $range;
1946 $x = $x * ($hi - $lo) / $inner_w + $lo; 2269 $value = $value * $self->{scale} + $self->{offset};
1947 $x = $lo if $x < $lo;
1948 $x = $hi - $page if $x > $hi - $page;
1949 $self->{range}[0] = $x;
1950 2270
1951 $self->emit (changed => $x); 2271 $self->{knob_x} = $value - $knob_w * 0.5;
1952 $self->update; 2272 $self->{knob_w} = $knob_w;
1953 } 2273 });
1954}
1955 2274
1956# the inner_* stuff is for generating a padding for the slider handle, 2275 $self->SUPER::update;
1957# so that the handle doesn't leave the texture. This calculation isn't 100%
1958# correct propably, but it does the job for now
1959sub _calc_inner_pad_px {
1960 my ($self, $w) = @_;
1961 ($w / 100) * $self->{inner_pad} # % to pixels
1962} 2276}
1963 2277
1964sub _draw { 2278sub _draw {
1965 my ($self) = @_; 2279 my ($self) = @_;
1966 2280
1967 $self->SUPER::_draw (); 2281 $self->SUPER::_draw ();
1968 2282
1969 my ($w, $h) = @$self{qw(w h)}; 2283 glScale $self->{w}, $self->{h};
1970 2284
1971 if ($self->{vertical}) { 2285 if ($self->{vertical}) {
1972 # draw a vertical slider like a rotated horizontal slider 2286 # draw a vertical slider like a rotated horizontal slider
1973 2287
2288 glTranslate 1, 0, 0;
1974 glRotate 90, 0, 0, 1; 2289 glRotate 90, 0, 0, 1;
1975 glTranslate 0, -$self->{w}, 0;
1976
1977 ($w, $h) = ($h, $w);
1978 } 2290 }
1979 2291
1980 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2292 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1981 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2293 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1982 2294
1983 my ($value, $lo, $hi, $page) = @{$self->{range}};
1984
1985 $hi = $value + 1 if $lo == $hi;
1986
1987 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1988 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1989
1990 $page = int $page * $inner_w / ($hi - $lo);
1991 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1992
1993 $w -= $page;
1994 $page &= ~1;
1995 glTranslate $page * 0.5, 0, 0;
1996 $page ||= 2;
1997
1998 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1999 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2000
2001 glEnable GL_BLEND;
2002 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2003 glEnable GL_TEXTURE_2D; 2295 glEnable GL_TEXTURE_2D;
2004 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2296 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2005 2297
2006 # draw background 2298 # draw background
2007 $tex[1]->draw_quad (0, 0, $w, $h); 2299 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2008 2300
2009 # draw handle 2301 # draw handle
2010 $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);
2011 2303
2012 glDisable GL_BLEND;
2013 glDisable GL_TEXTURE_2D; 2304 glDisable GL_TEXTURE_2D;
2014} 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 (@_) }
2015 2347
2016############################################################################# 2348#############################################################################
2017 2349
2018package CFClient::UI::TextView; 2350package CFClient::UI::TextView;
2019 2351
… …
2028 fontsize => 1, 2360 fontsize => 1,
2029 can_events => 0, 2361 can_events => 0,
2030 #font => default_font 2362 #font => default_font
2031 @_, 2363 @_,
2032 2364
2033 layout => (new CFClient::Layout), 2365 layout => (new CFClient::Layout 1),
2034 par => [], 2366 par => [],
2035 height => 0, 2367 height => 0,
2036 children => [ 2368 children => [
2037 (new CFClient::UI::Empty expand => 1), 2369 (new CFClient::UI::Empty expand => 1),
2038 (new CFClient::UI::Slider vertical => 1), 2370 (new CFClient::UI::Slider vertical => 1),
2039 ], 2371 ],
2040 ); 2372 );
2041 2373
2042 $self->{children}[1]->connect (changed => sub { 2374 $self->{children}[1]->connect (changed => sub { $self->update });
2043 $self->update;
2044 });
2045 2375
2046 $self 2376 $self
2047} 2377}
2048 2378
2049sub set_fontsize { 2379sub set_fontsize {
… …
2051 2381
2052 $self->{fontsize} = $fontsize; 2382 $self->{fontsize} = $fontsize;
2053 $self->reflow; 2383 $self->reflow;
2054} 2384}
2055 2385
2056sub text_height {
2057 my ($self, $text) = @_;
2058
2059 my $layout = $self->{layout};
2060
2061 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2062 $layout->set_width ($self->{w});
2063 $layout->set_text ($text);
2064
2065 ($layout->size)[1]
2066}
2067
2068sub reflow {
2069 my ($self) = @_;
2070
2071 $self->{need_reflow}++;
2072 $self->update;
2073}
2074
2075sub size_allocate { 2386sub size_allocate {
2076 my ($self, $w, $h) = @_; 2387 my ($self, $w, $h, $changed) = @_;
2077 2388
2078 $self->SUPER::size_allocate ($w, $h); 2389 $self->SUPER::size_allocate ($w, $h, $changed);
2390
2391 return unless $changed;
2079 2392
2080 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2393 $self->{layout}->set_font ($self->{font}) if $self->{font};
2081 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2394 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2082 $self->{layout}->set_width ($self->{children}[0]{w}); 2395 $self->{layout}->set_width ($self->{children}[0]{w});
2083 2396
2084 $self->reflow; 2397 $self->reflow;
2085} 2398}
2086 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
2087sub add_paragraph { 2434sub add_paragraph {
2088 my ($self, $color, $text) = @_; 2435 my ($self, $color, $text, $indent) = @_;
2089 2436
2090 #TODO: intelligently "reformat" paragraph 2437 for my $line (split /\n/, $text) {
2091 2438 my ($w, $h) = $self->text_size ($line);
2092 my $height = $self->text_height ($text);
2093
2094 $self->{height} += $height; 2439 $self->{height} += $h;
2440 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2441 }
2095 2442
2096 push @{$self->{par}}, [$height, $color, $text];
2097
2098 $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]);
2099 $self->{children}[1]->update;
2100} 2444}
2101 2445
2102sub update { 2446sub update {
2103 my ($self) = @_; 2447 my ($self) = @_;
2104 2448
… …
2106 2450
2107 return unless $self->{h} > 0; 2451 return unless $self->{h} > 0;
2108 2452
2109 delete $self->{texture}; 2453 delete $self->{texture};
2110 2454
2111 $ROOT->on_refresh ($self, sub { 2455 $ROOT->on_post_alloc ($self, sub {
2456 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2457
2112 if (delete $self->{need_reflow}) { 2458 if (delete $self->{need_reflow}) {
2113 my $height = 0; 2459 my $height = 0;
2114 2460
2115 $height += $_->[0] = $self->text_height ($_->[2]) 2461 my $layout = $self->{layout};
2462
2463 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2464
2116 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 }
2117 2476
2118 $self->{height} = $height; 2477 $self->{height} = $height;
2119 2478
2120 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2479 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2121 2480
2122 delete $self->{texture}; 2481 delete $self->{texture};
2123 } 2482 }
2124 2483
2125 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2484 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2126 glClearColor 0, 0, 0, 1; 2485 glClearColor 0.5, 0.5, 0.5, 0;
2127 glClear GL_COLOR_BUFFER_BIT; 2486 glClear GL_COLOR_BUFFER_BIT;
2128 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
2129 glEnable GL_BLEND; 2499 glEnable GL_BLEND;
2500 #TODO# not correct in windows where rgba is forced off
2130 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2501 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2131 glEnable GL_TEXTURE_2D;
2132 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2133
2134 my $top = int $self->{children}[1]{range}[0];
2135
2136 my $y0 = $top;
2137 my $y1 = $top + $self->{h};
2138
2139 my $y = 0;
2140
2141 my $layout = $self->{layout};
2142
2143 $layout->set_font ($self->{font}) if $self->{font};
2144 2502
2145 for my $par (@{$self->{par}}) { 2503 for my $par (@{$self->{par}}) {
2146 my $h = $par->[0]; 2504 my $h = $par->[1];
2147 2505
2148 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]);
2149 $layout->set_text ($par->[2]); 2509 $layout->set_markup ($par->[4]);
2150 2510
2151 glColor @{ $par->[1] }; 2511 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2152 my ($W, $H) = $layout->size; 2512
2153 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;
2154 } 2515 }
2155 2516
2156 $y += $h; 2517 $y += $h;
2157 } 2518 }
2158 2519
2159 glDisable GL_TEXTURE_2D;
2160 glDisable GL_BLEND; 2520 glDisable GL_BLEND;
2161 }; 2521 };
2162 }); 2522 });
2163} 2523}
2164 2524
2165sub _draw { 2525sub _draw {
2166 my ($self) = @_; 2526 my ($self) = @_;
2167 2527
2168 if ($self->{texture}) {
2169 glEnable GL_TEXTURE_2D; 2528 glEnable GL_TEXTURE_2D;
2170 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2529 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2171 glColor 1, 1, 1, 1; 2530 glColor 1, 1, 1, 1;
2172 $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});
2173 glDisable GL_TEXTURE_2D; 2532 glDisable GL_TEXTURE_2D;
2174 }
2175 2533
2176 $self->{children}[1]->draw; 2534 $self->{children}[1]->draw;
2177 2535
2178} 2536}
2179 2537
… …
2227 2585
2228sub new { 2586sub new {
2229 my $class = shift; 2587 my $class = shift;
2230 2588
2231 my $self = $class->SUPER::new ( 2589 my $self = $class->SUPER::new (
2232 state => 0, 2590 state => 0,
2233 connect_activate => \&toggle_flopper, 2591 on_activate => \&toggle_flopper,
2234 @_ 2592 @_
2235 ); 2593 );
2236 2594
2237 if ($self->{state}) {
2238 $self->{state} = 0;
2239 $self->toggle_flopper;
2240 }
2241
2242 $self 2595 $self
2243} 2596}
2244 2597
2245sub toggle_flopper { 2598sub toggle_flopper {
2246 my ($self) = @_; 2599 my ($self) = @_;
2247 2600
2248 # TODO: use animation 2601 $self->{other}->toggle_visibility;
2249 if ($self->{state} = !$self->{state}) {
2250 $CFClient::UI::ROOT->add ($self->{other});
2251 $self->{other}->move ($self->coord2global (0, $self->{h}));
2252 $self->emit ("open");
2253 } else {
2254 $CFClient::UI::ROOT->remove ($self->{other});
2255 $self->emit ("close");
2256 }
2257
2258 $self->emit (changed => $self->{state});
2259} 2602}
2260 2603
2261############################################################################# 2604#############################################################################
2262 2605
2263package CFClient::UI::Tooltip; 2606package CFClient::UI::Tooltip;
… …
2273 @_, 2616 @_,
2274 can_events => 0, 2617 can_events => 0,
2275 ) 2618 )
2276} 2619}
2277 2620
2278sub set_markup { 2621sub set_tooltip_from {
2279 my ($self, $text) = @_; 2622 my ($self, $widget) = @_;
2280 2623
2281 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2624 $self->add (new CFClient::UI::Label
2282 $self->{label}->set_markup ($text); 2625 markup => $widget->{tooltip},
2283 $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 );
2284} 2632}
2285 2633
2286sub size_request { 2634sub size_request {
2287 my ($self) = @_; 2635 my ($self) = @_;
2288 2636
2289 $self->child->set_max_size ($::WIDTH * 0.3);
2290
2291 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2637 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2292 2638
2293 ($w + 4, $h + 4) 2639 ($w + 4, $h + 4)
2294} 2640}
2295 2641
2296sub size_allocate { 2642sub size_allocate {
2297 my ($self, $w, $h) = @_; 2643 my ($self, $w, $h, $changed) = @_;
2298 2644
2645 return unless $changed;
2646
2299 $self->SUPER::size_allocate ($w - 4, $h - 4); 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 });
2300} 2666}
2301 2667
2302sub _draw { 2668sub _draw {
2303 my ($self) = @_; 2669 my ($self) = @_;
2304 2670
2305 glPushMatrix;
2306 glTranslate 0.375, 0.375; 2671 glTranslate 0.375, 0.375;
2307 2672
2308 my ($w, $h) = @$self{qw(w h)}; 2673 my ($w, $h) = @$self{qw(w h)};
2309 2674
2310 glColor 1, 0.8, 0.4; 2675 glColor 1, 0.8, 0.4;
… …
2321 glVertex 0 , $h; 2686 glVertex 0 , $h;
2322 glVertex $w, $h; 2687 glVertex $w, $h;
2323 glVertex $w, 0; 2688 glVertex $w, 0;
2324 glEnd; 2689 glEnd;
2325 2690
2326 glPopMatrix; 2691 glTranslate 2 - 0.375, 2 - 0.375;
2327 2692
2328 glTranslate 2, 2;
2329 $self->SUPER::_draw; 2693 $self->SUPER::_draw;
2330} 2694}
2331 2695
2332############################################################################# 2696#############################################################################
2333 2697
… …
2338use CFClient::OpenGL; 2702use CFClient::OpenGL;
2339 2703
2340sub new { 2704sub new {
2341 my $class = shift; 2705 my $class = shift;
2342 2706
2343 $class->SUPER::new ( 2707 my $self = $class->SUPER::new (
2344 aspect => 1, 2708 aspect => 1,
2709 can_events => 0,
2345 @_, 2710 @_,
2346 ) 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
2347} 2728}
2348 2729
2349sub size_request { 2730sub size_request {
2350 (32, 8) 2731 (32, 8)
2351} 2732}
2352 2733
2734sub update {
2735 my ($self) = @_;
2736
2737 return unless $self->{visible};
2738
2739 $self->SUPER::update;
2740}
2741
2353sub draw { 2742sub _draw {
2354 my ($self) = @_; 2743 my ($self) = @_;
2355 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
2356 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2756 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2357 2757
2358 if ($tex) { 2758 if ($tex) {
2359 glEnable GL_BLEND;
2360 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2361 glEnable GL_TEXTURE_2D; 2759 glEnable GL_TEXTURE_2D;
2362 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2760 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2363 glColor 1, 1, 1, 1; 2761 glColor 1, 1, 1, 1;
2364 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2762 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2365 glDisable GL_TEXTURE_2D; 2763 glDisable GL_TEXTURE_2D;
2366 glDisable GL_BLEND;
2367 } 2764 }
2765}
2766
2767sub DESTROY {
2768 my ($self) = @_;
2769
2770 $self->{timer}->cancel
2771 if $self->{timer};
2772
2773 $self->SUPER::DESTROY;
2368} 2774}
2369 2775
2370############################################################################# 2776#############################################################################
2371 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
2372package CFClient::UI::Root; 3002package CFClient::UI::Root;
2373 3003
2374our @ISA = CFClient::UI::Container::; 3004our @ISA = CFClient::UI::Container::;
2375 3005
2376use CFClient::OpenGL; 3006use CFClient::OpenGL;
2377 3007
2378sub check_size { 3008sub new {
2379 my ($self) = @_; 3009 my $class = shift;
2380 3010
2381 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 3011 my $self = $class->SUPER::new (
2382} 3012 visible => 1,
3013 @_,
3014 );
2383 3015
2384sub size_request { 3016 Scalar::Util::weaken ($self->{root} = $self);
2385 ($::WIDTH, $::HEIGHT) 3017
3018 $self
2386} 3019}
2387 3020
2388sub configure { 3021sub configure {
2389 my ($self, $x, $y, $w, $h) = @_; 3022 my ($self, $x, $y, $w, $h) = @_;
2390 3023
2391 $self->SUPER::configure ($x, $y, $w, $h); 3024 $self->{w} = $w;
3025 $self->{h} = $h;
3026}
2392 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
2393 for my $child (@{$self->{children}}) { 3060 for my $child ($self->children) {
2394 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)};
2395 3062
2396 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3063 $X = $child->{force_x} if exists $child->{force_x};
2397 $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
2398 $child->configure ($X, $Y, $W,$H); 3069 $child->configure ($X, $Y, $W, $H);
2399 } 3070 }
2400} 3071}
2401 3072
2402sub _topleft { 3073sub coord2local {
2403 my ($self, $x, $y) = @_; 3074 my ($self, $x, $y) = @_;
2404 3075
2405 ($x, $y) 3076 ($x, $y)
2406} 3077}
2407 3078
3079sub coord2global {
3080 my ($self, $x, $y) = @_;
3081
3082 ($x, $y)
3083}
3084
2408sub update { 3085sub update {
2409 my ($self) = @_; 3086 my ($self) = @_;
2410 3087
2411 $self->check_size; 3088 $::WANT_REFRESH++;
2412 ::refresh ();
2413} 3089}
2414 3090
2415sub add { 3091sub add {
2416 my ($self, $child) = @_; 3092 my ($self, @children) = @_;
2417 3093
2418 # integerize window positions 3094 $_->{is_toplevel} = 1
2419 $child->{x} = int $child->{x}; 3095 for @children;
2420 $child->{y} = int $child->{y};
2421 3096
2422 $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 }
2423} 3113}
2424 3114
2425sub on_refresh { 3115sub on_refresh {
2426 my ($self, $id, $cb) = @_; 3116 my ($self, $id, $cb) = @_;
2427 3117
2428 $self->{refresh_hook}{$id} = $cb; 3118 $self->{refresh_hook}{$id} = $cb;
2429} 3119}
2430 3120
3121sub on_post_alloc {
3122 my ($self, $id, $cb) = @_;
3123
3124 $self->{post_alloc_hook}{$id} = $cb;
3125}
3126
2431sub draw { 3127sub draw {
2432 my ($self) = @_; 3128 my ($self) = @_;
2433 3129
2434 while (my $rcb = delete $self->{refresh_hook}) { 3130 while ($self->{refresh_hook}) {
2435 $_->() 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}};
2436 } 3196 }
2437 3197
2438 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3198 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2439 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3199 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2440 glClear GL_COLOR_BUFFER_BIT; 3200 glClear GL_COLOR_BUFFER_BIT;
2441 3201
2442 glMatrixMode GL_PROJECTION; 3202 glMatrixMode GL_PROJECTION;
2443 glLoadIdentity; 3203 glLoadIdentity;
2444 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3204 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2445 glMatrixMode GL_MODELVIEW; 3205 glMatrixMode GL_MODELVIEW;
2446 glLoadIdentity; 3206 glLoadIdentity;
2447 3207
2448 $self->_draw; 3208 $self->_draw;
2449} 3209}
… …
2451############################################################################# 3211#############################################################################
2452 3212
2453package CFClient::UI; 3213package CFClient::UI;
2454 3214
2455$ROOT = new CFClient::UI::Root; 3215$ROOT = new CFClient::UI::Root;
2456$TOOLTIP = new CFClient::UI::Tooltip; 3216$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2457 3217
24581 32181
2459 3219

Diff Legend

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