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

Diff Legend

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