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.188 by root, Mon May 8 21:16:09 2006 UTC vs.
Revision 1.259 by root, Tue May 30 07:13:09 2006 UTC

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

Diff Legend

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