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

Diff Legend

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