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.186 by root, Mon May 8 20:39:34 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#############################################################################
… …
530 665
531 $self 666 $self
532} 667}
533 668
534sub add { 669sub add {
535 my ($self, $child) = @_; 670 my ($self, @widgets) = @_;
536 671
537 $child->set_parent ($self); 672 $_->set_parent ($self)
673 for @widgets;
538 674
539 use sort 'stable'; 675 use sort 'stable';
540 676
541 $self->{children} = [ 677 $self->{children} = [
542 sort { $a->{z} <=> $b->{z} } 678 sort { $a->{z} <=> $b->{z} }
543 @{$self->{children}}, $child 679 @{$self->{children}}, @widgets
544 ]; 680 ];
545 681
546 $child->check_size; 682 $self->realloc;
547 $self->update;
548} 683}
549 684
550sub children { 685sub children {
551 @{ $_[0]{children} } 686 @{ $_[0]{children} }
552} 687}
… …
557 delete $child->{parent}; 692 delete $child->{parent};
558 $child->hide; 693 $child->hide;
559 694
560 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 695 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
561 696
562 $self->check_size; 697 $self->realloc;
563 $self->update;
564} 698}
565 699
566sub clear { 700sub clear {
567 my ($self) = @_; 701 my ($self) = @_;
568 702
… …
572 for (@$children) { 706 for (@$children) {
573 delete $_->{parent}; 707 delete $_->{parent};
574 $_->hide; 708 $_->hide;
575 } 709 }
576 710
577 $self->check_size; 711 $self->realloc;
578 $self->update;
579} 712}
580 713
581sub find_widget { 714sub find_widget {
582 my ($self, $x, $y) = @_; 715 my ($self, $x, $y) = @_;
583 716
… …
658} 791}
659 792
660sub update { 793sub update {
661 my ($self) = @_; 794 my ($self) = @_;
662 795
663 $ROOT->on_refresh ($self => sub { $self->render_child }); 796 $ROOT->on_post_alloc ($self => sub { $self->render_child });
664 $self->SUPER::update; 797 $self->SUPER::update;
665} 798}
666 799
667sub size_allocate { 800sub size_allocate {
668 my ($self, $w, $h) = @_; 801 my ($self, $w, $h) = @_;
… …
681 $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 {
682 glClearColor 0, 0, 0, 0; 815 glClearColor 0, 0, 0, 0;
683 glClear GL_COLOR_BUFFER_BIT; 816 glClear GL_COLOR_BUFFER_BIT;
684 817
685 $self->_render; 818 $self->_render;
686# glColorMask 1, 1, 1, 0;
687# glEnable GL_BLEND;
688# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
689# glRasterPos 0, 0;
690# glCopyPixels 0, 0, $self->{w}, $self->{h};
691# glDisable GL_BLEND;
692# glColorMask 1, 1, 1, 1;
693 }; 819 };
694} 820}
695 821
696sub _draw { 822sub _draw {
697 my ($self) = @_; 823 my ($self) = @_;
… …
699 my ($w, $h) = ($self->w, $self->h); 825 my ($w, $h) = ($self->w, $self->h);
700 826
701 my $tex = $self->{texture} 827 my $tex = $self->{texture}
702 or return; 828 or return;
703 829
704 glEnable GL_BLEND;
705 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
706 glEnable GL_TEXTURE_2D; 830 glEnable GL_TEXTURE_2D;
707 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 831 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
708 glColor 0, 0, 0, 1; 832 glColor 1, 1, 1, 1;
709 833
710 $tex->draw_quad (0, 0, $w, $h); 834 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
711 835
712 glDisable GL_BLEND;
713 glDisable GL_TEXTURE_2D; 836 glDisable GL_TEXTURE_2D;
714} 837}
715 838
716############################################################################# 839#############################################################################
717 840
718package CFClient::UI::ViewPort; 841package CFClient::UI::ViewPort;
719 842
720our @ISA = CFClient::UI::Window::; 843our @ISA = CFClient::UI::Window::;
721 844
845sub new {
846 my $class = shift;
847
848 $class->SUPER::new (
849 scroll_x => 0,
850 scroll_y => 1,
851 @_,
852 )
853}
854
722sub size_request { 855sub size_request {
723 my ($self) = @_; 856 my ($self) = @_;
724 857
725 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 858 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
726 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
727 859
728 @$self{qw(child_w child_h)} 860 $w = 10 if $self->{scroll_x};
861 $h = 10 if $self->{scroll_y};
862
863 ($w, $h)
729} 864}
730 865
731sub size_allocate { 866sub size_allocate {
732 my ($self, $w, $h) = @_; 867 my ($self, $w, $h) = @_;
733 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);
734 $self->update; 875 $self->update;
735} 876}
736 877
737sub set_offset { 878sub set_offset {
738 my ($self, $x, $y) = @_; 879 my ($self, $x, $y) = @_;
… …
741 $self->{view_y} = int $y; 882 $self->{view_y} = int $y;
742 883
743 $self->update; 884 $self->update;
744} 885}
745 886
746# 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
747sub _topleft { 888sub coord2local {
748 my ($self, $x, $y) = @_; 889 my ($self, $x, $y) = @_;
749 890
750 $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)
751} 901}
752 902
753sub find_widget { 903sub find_widget {
754 my ($self, $x, $y) = @_; 904 my ($self, $x, $y) = @_;
755 905
… …
780 my $class = shift; 930 my $class = shift;
781 931
782 my $self; 932 my $self;
783 933
784 my $slider = new CFClient::UI::Slider 934 my $slider = new CFClient::UI::Slider
785 vertical => 1, 935 vertical => 1,
786 range => [0, 0, 1, 0.01], # HACK fix 936 range => [0, 0, 1, 0.01], # HACK fix
787 connect_changed => sub { 937 on_changed => sub {
788 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 938 $self->{vp}->set_offset (0, $_[1]);
789 }, 939 },
790 ; 940 ;
791 941
792 $self = $class->SUPER::new ( 942 $self = $class->SUPER::new (
793 vp => (new CFClient::UI::ViewPort), 943 vp => (new CFClient::UI::ViewPort expand => 1),
794 slider => $slider, 944 slider => $slider,
795 @_, 945 @_,
796 ); 946 );
797 947
798 $self->{vp}->add ($self->{scrolled}); 948 $self->{vp}->add ($self->{scrolled});
… …
800 $self->add ($self->{slider}); 950 $self->add ($self->{slider});
801 951
802 $self 952 $self
803} 953}
804 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
805#TODO# update range on size_allocate depeneing on child 974#TODO# update range on size_allocate depending on child
806# update viewport offset on scroll 975# update viewport offset on scroll
807 976
808############################################################################# 977#############################################################################
809 978
810package CFClient::UI::Frame; 979package CFClient::UI::Frame;
… …
814use CFClient::OpenGL; 983use CFClient::OpenGL;
815 984
816sub new { 985sub new {
817 my $class = shift; 986 my $class = shift;
818 987
819 my $self = $class->SUPER::new ( 988 $class->SUPER::new (
820 bg => [1, 1, 1, 1], 989 bg => undef,
821 border_bg => [1, 1, 1, 1],
822 border => 0.8,
823 @_ 990 @_,
824 ); 991 )
825
826 $self
827} 992}
828 993
829sub _draw { 994sub _draw {
830 my ($self) = @_; 995 my ($self) = @_;
831 996
832 my ($w, $h) = ($self->{w}, $self->{h}); 997 if ($self->{bg}) {
998 my ($w, $h) = @$self{qw(w h)};
833 999
834 glEnable GL_BLEND; 1000 glEnable GL_BLEND;
835 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1001 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
836 glEnable GL_TEXTURE_2D; 1002 glColor @{ $self->{bg} };
837 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
838 1003
839# glBegin GL_QUADS; 1004 glBegin GL_QUADS;
840# glColor 0, 0, 0, 0;
841# glVertex 0 , 0; 1005 glVertex 0 , 0;
842# glVertex 0 , $h; 1006 glVertex 0 , $h;
843# glVertex $w, $h; 1007 glVertex $w, $h;
844# glVertex $w, 0; 1008 glVertex $w, 0;
845# glEnd; 1009 glEnd;
846 1010
847
848 $self->child->draw;
849 glDisable GL_BLEND; 1011 glDisable GL_BLEND;
850 glDisable GL_TEXTURE_2D; 1012 }
1013
1014 $self->SUPER::_draw;
851} 1015}
852 1016
853############################################################################# 1017#############################################################################
854 1018
855package CFClient::UI::FancyFrame; 1019package CFClient::UI::FancyFrame;
856 1020
857our @ISA = CFClient::UI::Bin::; 1021our @ISA = CFClient::UI::Bin::;
858 1022
859use CFClient::OpenGL; 1023use CFClient::OpenGL;
860 1024
861my @tex = 1025my $bg =
1026 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1027 mipmap => 1, wrap => 1;
1028
1029my @border =
862 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1030 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
863 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);
864 1032
865sub new { 1033sub new {
866 my $class = shift; 1034 my $class = shift;
867 1035
868 # TODO: user_x, user_y, overwrite moveto?
869
870 my $self = $class->SUPER::new ( 1036 my $self = $class->SUPER::new (
871 bg => [1, 1, 1, 1], 1037 bg => [1, 1, 1, 1],
872 border_bg => [1, 1, 1, 1], 1038 border_bg => [1, 1, 1, 1],
873 border => 0.6, 1039 border => 0.6,
874 can_events => 1, 1040 can_events => 1,
1041 min_w => 16,
1042 min_h => 16,
875 @_ 1043 @_
876 ); 1044 );
877 1045
878 $self->{title} &&= new CFClient::UI::Label 1046 $self->{title} &&= new CFClient::UI::Label
879 align => 0, 1047 align => 0,
… …
903 my ($self, $w, $h) = @_; 1071 my ($self, $w, $h) = @_;
904 1072
905 $h -= List::Util::max 0, $self->border * 2; 1073 $h -= List::Util::max 0, $self->border * 2;
906 $w -= List::Util::max 0, $self->border * 2; 1074 $w -= List::Util::max 0, $self->border * 2;
907 1075
908 $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)
909 if $self->{title}; 1077 if $self->{title};
910 1078
911 $self->child->configure ($self->border, $self->border, $w, $h); 1079 $self->child->configure ($self->border, $self->border, $w, $h);
912} 1080}
913 1081
… …
932 my ($ev, $x, $y) = @_; 1100 my ($ev, $x, $y) = @_;
933 1101
934 my $dx = $ev->{x} - $ox; 1102 my $dx = $ev->{x} - $ox;
935 my $dy = $ev->{y} - $oy; 1103 my $dy = $ev->{y} - $oy;
936 1104
937 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1105 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
938 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1106 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1107
1108 $self->realloc;
939 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1109 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
940 $self->check_size;
941 }; 1110 };
942 1111
943 } elsif ($lr ^ $td) { 1112 } elsif ($lr ^ $td) {
944 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1113 my ($ox, $oy) = ($ev->{x}, $ev->{y});
945 my ($bx, $by) = ($self->{x}, $self->{y}); 1114 my ($bx, $by) = ($self->{x}, $self->{y});
… …
947 $self->{motion} = sub { 1116 $self->{motion} = sub {
948 my ($ev, $x, $y) = @_; 1117 my ($ev, $x, $y) = @_;
949 1118
950 ($x, $y) = ($ev->{x}, $ev->{y}); 1119 ($x, $y) = ($ev->{x}, $ev->{y});
951 1120
952 $self->move ($bx + $x - $ox, $by + $y - $oy); 1121 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
953 $self->update;
954 }; 1122 };
955 } 1123 }
956} 1124}
957 1125
958sub button_up { 1126sub button_up {
… …
971 my ($self) = @_; 1139 my ($self) = @_;
972 1140
973 my ($w, $h ) = ($self->{w}, $self->{h}); 1141 my ($w, $h ) = ($self->{w}, $self->{h});
974 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1142 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
975 1143
976 glEnable GL_BLEND;
977 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
978 glEnable GL_TEXTURE_2D; 1144 glEnable GL_TEXTURE_2D;
979 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1145 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
980 1146
981 my $border = $self->border; 1147 my $border = $self->border;
982 1148
983 glColor @{ $self->{border_bg} }; 1149 glColor @{ $self->{border_bg} };
984 $tex[1]->draw_quad (0, 0, $w, $border); 1150 $border[0]->draw_quad_alpha (0, 0, $w, $border);
985 $tex[3]->draw_quad (0, $border, $border, $ch); 1151 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
986 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1152 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
987 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1153 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
988 1154
989 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1155 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
990 my $bg = $tex[0]; 1156 glColor @{ $self->{bg} };
991 1157
992 # TODO: repeat texture not scale 1158 # TODO: repeat texture not scale
1159 # solve this better(?)
993 my $rep_x = $cw / $bg->{w}; 1160 $bg->{s} = $cw / $bg->{w};
994 my $rep_y = $ch / $bg->{h}; 1161 $bg->{t} = $ch / $bg->{h};
995
996 glColor @{ $self->{bg} };
997
998 $bg->{s} = $rep_x;
999 $bg->{t} = $rep_y;
1000 $bg->{wrap_mode} = 1;
1001 $bg->draw_quad ($border, $border, $cw, $ch); 1162 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1163 }
1002 1164
1003 glDisable GL_TEXTURE_2D; 1165 glDisable GL_TEXTURE_2D;
1004 glDisable GL_BLEND;
1005 }
1006 1166
1007 $self->{title}->draw if $self->{title}; 1167 $self->{title}->draw if $self->{title};
1008 1168
1009 $self->child->draw; 1169 $self->child->draw;
1010} 1170}
… …
1022sub new { 1182sub new {
1023 my $class = shift; 1183 my $class = shift;
1024 1184
1025 $class->SUPER::new ( 1185 $class->SUPER::new (
1026 col_expand => [], 1186 col_expand => [],
1027 @_ 1187 @_,
1028 ) 1188 )
1189}
1190
1191sub children {
1192 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1029} 1193}
1030 1194
1031sub add { 1195sub add {
1032 my ($self, $x, $y, $child) = @_; 1196 my ($self, $x, $y, $child) = @_;
1033 1197
1034 $child->set_parent ($self); 1198 $child->set_parent ($self);
1035 $self->{children}[$y][$x] = $child; 1199 $self->{children}[$y][$x] = $child;
1036 1200
1037 $child->check_size; 1201 $self->realloc;
1038} 1202}
1039 1203
1040sub children {
1041 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1042}
1043
1044# 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?
1045sub clear { 1205sub clear {
1046 my ($self) = @_; 1206 my ($self) = @_;
1047 1207
1048 my @children = $self->children; 1208 my @children = $self->children;
1049 delete $self->{children}; 1209 delete $self->{children};
… …
1051 for (@children) { 1211 for (@children) {
1052 delete $_->{parent}; 1212 delete $_->{parent};
1053 $_->hide; 1213 $_->hide;
1054 } 1214 }
1055 1215
1056 $self->update; 1216 $self->realloc;
1057} 1217}
1058 1218
1059sub get_wh { 1219sub get_wh {
1060 my ($self) = @_; 1220 my ($self) = @_;
1061 1221
… …
1092sub size_allocate { 1252sub size_allocate {
1093 my ($self, $w, $h) = @_; 1253 my ($self, $w, $h) = @_;
1094 1254
1095 my ($ws, $hs) = $self->get_wh; 1255 my ($ws, $hs) = $self->get_wh;
1096 1256
1097 my $req_w = sum @$ws; 1257 my $req_w = (sum @$ws) || 1;
1098 my $req_h = sum @$hs; 1258 my $req_h = (sum @$hs) || 1;
1099 1259
1100 # TODO: nicer code && do row_expand 1260 # TODO: nicer code && do row_expand
1101 my @col_expand = @{$self->{col_expand}}; 1261 my @col_expand = @{$self->{col_expand}};
1102 @col_expand = (1) x @$ws unless @col_expand; 1262 @col_expand = (1) x @$ws unless @col_expand;
1103 my $col_expand = (sum @col_expand) || 1; 1263 my $col_expand = (sum @col_expand) || 1;
… …
1157 } 1317 }
1158} 1318}
1159 1319
1160############################################################################# 1320#############################################################################
1161 1321
1162package CFClient::UI::HBox; 1322package CFClient::UI::Box;
1163
1164# TODO: wrap into common Box base class
1165 1323
1166our @ISA = CFClient::UI::Container::; 1324our @ISA = CFClient::UI::Container::;
1167 1325
1168sub size_request { 1326sub size_request {
1169 my ($self) = @_; 1327 my ($self) = @_;
1170 1328
1171 my @alloc = map [$_->size_request], @{$self->{children}}; 1329 $self->{vertical}
1172 1330 ? (
1173 ( 1331 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1174 (List::Util::sum map $_->[0], @alloc), 1332 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1175 (List::Util::max map $_->[1], @alloc), 1333 )
1176 ) 1334 : (
1335 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1336 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1337 )
1177} 1338}
1178 1339
1179sub size_allocate { 1340sub size_allocate {
1180 my ($self, $w, $h) = @_; 1341 my ($self, $w, $h) = @_;
1181 1342
1182 ($h, $w) = ($w, $h); 1343 my $space = $self->{vertical} ? $h : $w;
1183
1184 my $children = $self->{children}; 1344 my $children = $self->{children};
1185 1345
1186 my @h = map $_->{req_w}, @$children; 1346 my @req;
1187 1347
1188 my $req_h = List::Util::sum @h; 1348 if ($self->{homogeneous}) {
1189 1349 @req = ($space / (@$children || 1)) x @$children;
1190 if ($req_h > $h) {
1191 # ah well, not enough space
1192 $_ *= $h / $req_h for @h;
1193 } 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 {
1194 my $exp = List::Util::sum map $_->{expand}, @$children; 1358 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1195 $exp ||= 1;
1196 1359
1360 $space = ($space - $req) / $expand; # remaining space to give away
1361
1362 $req[$_] += $space * $children->[$_]{expand}
1197 for (0 .. $#$children) { 1363 for 0 .. $#$children;
1198 my $child = $children->[$_];
1199
1200 my $alloc_h = $h[$_];
1201 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1202 $h[$_] = $alloc_h;
1203 } 1364 }
1204 } 1365 }
1205 1366
1206 CFClient::UI::harmonize \@h; 1367 CFClient::UI::harmonize \@req;
1207 1368
1208 my $y = 0; 1369 my $pos = 0;
1209 for (0 .. $#$children) { 1370 for (0 .. $#$children) {
1210 my $child = $children->[$_];
1211 my $h = $h[$_]; 1371 my $alloc = $req[$_];
1212 $child->configure ($y, 0, $h, $w); 1372 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1213 1373
1214 $y += $h; 1374 $pos += $alloc;
1215 } 1375 }
1216 1376
1217 1 1377 1
1218} 1378}
1219 1379
1220############################################################################# 1380#############################################################################
1221 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
1222package CFClient::UI::VBox; 1397package CFClient::UI::VBox;
1223 1398
1224# TODO: wrap into common Box base class
1225
1226our @ISA = CFClient::UI::Container::; 1399our @ISA = CFClient::UI::Box::;
1227 1400
1228sub size_request { 1401sub new {
1229 my ($self) = @_; 1402 my $class = shift;
1230 1403
1231 my @alloc = map [$_->size_request], @{$self->{children}}; 1404 $class->SUPER::new (
1232 1405 vertical => 1,
1233 ( 1406 @_,
1234 (List::Util::max map $_->[0], @alloc),
1235 (List::Util::sum map $_->[1], @alloc),
1236 ) 1407 )
1237} 1408}
1238 1409
1239sub size_allocate {
1240 my ($self, $w, $h) = @_;
1241
1242 my $children = $self->{children};
1243
1244 my @h = map $_->{req_h}, @$children;
1245
1246 my $req_h = List::Util::sum @h;
1247
1248 if ($req_h > $h) {
1249 # ah well, not enough space
1250 $_ *= $h / $req_h for @h;
1251 } else {
1252 my $exp = List::Util::sum map $_->{expand}, @$children;
1253 $exp ||= 1;
1254
1255 for (0 .. $#$children) {
1256 my $child = $children->[$_];
1257
1258 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1259 }
1260 }
1261
1262 CFClient::UI::harmonize \@h;
1263
1264 my $y = 0;
1265 for (0 .. $#$children) {
1266 my $child = $children->[$_];
1267 my $h = $h[$_];
1268 $child->configure (0, $y, $w, $h);
1269
1270 $y += $h;
1271 }
1272
1273 1
1274}
1275
1276############################################################################# 1410#############################################################################
1277 1411
1278package CFClient::UI::Label; 1412package CFClient::UI::Label;
1279 1413
1280our @ISA = CFClient::UI::Base::; 1414our @ISA = CFClient::UI::DrawBG::;
1281 1415
1282use CFClient::OpenGL; 1416use CFClient::OpenGL;
1283 1417
1284sub new { 1418sub new {
1285 my ($class, %arg) = @_; 1419 my ($class, %arg) = @_;
1286 1420
1287 my $self = $class->SUPER::new ( 1421 my $self = $class->SUPER::new (
1288 fg => [1, 1, 1], 1422 fg => [1, 1, 1],
1423 #bg => none
1424 #active_bg => none
1289 #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),
1290 fontsize => 1, 1431 fontsize => 1,
1291 text => "",
1292 align => -1, 1432 align => -1,
1293 valign => -1, 1433 valign => -1,
1294 padding => 2, 1434 padding_x => 2,
1295 layout => new CFClient::Layout, 1435 padding_y => 2,
1296 can_events => 0, 1436 can_events => 0,
1297 %arg 1437 %arg
1298 ); 1438 );
1299 1439
1300 if (exists $self->{template}) { 1440 if (exists $self->{template}) {
1301 my $layout = new CFClient::Layout; 1441 my $layout = new CFClient::Layout;
1302 $layout->set_text (delete $self->{template}); 1442 $layout->set_text (delete $self->{template});
1303 $self->{template} = $layout; 1443 $self->{template} = $layout;
1304 } 1444 }
1305 1445
1306 $self->set_text (delete $self->{text}) if exists $self->{text}; 1446 if (exists $self->{markup}) {
1307 $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 }
1308 1451
1309 $self 1452 $self
1310} 1453}
1311 1454
1312sub escape { 1455sub escape($) {
1313 local $_ = $_[1]; 1456 local $_ = $_[0];
1314 1457
1315 s/&/&amp;/g; 1458 s/&/&amp;/g;
1316 s/>/&gt;/g; 1459 s/>/&gt;/g;
1317 s/</&lt;/g; 1460 s/</&lt;/g;
1318 1461
1319 $_[1] 1462 $_
1320} 1463}
1321 1464
1322sub update { 1465sub update {
1323 my ($self) = @_; 1466 my ($self) = @_;
1324 1467
… …
1330 my ($self, $text) = @_; 1473 my ($self, $text) = @_;
1331 1474
1332 return if $self->{text} eq "T$text"; 1475 return if $self->{text} eq "T$text";
1333 $self->{text} = "T$text"; 1476 $self->{text} = "T$text";
1334 1477
1478 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1335 $self->{layout}->set_text ($text); 1479 $self->{layout}->set_text ($text);
1336 1480
1337 delete $self->{texture}; 1481 $self->realloc;
1338 $self->update; 1482 $self->update;
1339 $self->check_size;
1340} 1483}
1341 1484
1342sub set_markup { 1485sub set_markup {
1343 my ($self, $markup) = @_; 1486 my ($self, $markup) = @_;
1344 1487
1345 return if $self->{text} eq "M$markup"; 1488 return if $self->{text} eq "M$markup";
1346 $self->{text} = "M$markup"; 1489 $self->{text} = "M$markup";
1347 1490
1491 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1492
1493 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1348 $self->{layout}->set_markup ($markup); 1494 $self->{layout}->set_markup ($markup);
1349 1495
1350 delete $self->{texture}; 1496 $self->realloc;
1351 $self->update; 1497 $self->update;
1352 $self->check_size;
1353} 1498}
1354 1499
1355sub size_request { 1500sub size_request {
1356 my ($self) = @_; 1501 my ($self) = @_;
1357 1502
1358 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1503 $self->{layout}->set_font ($self->{font}) if $self->{font};
1359 $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});
1360 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1507 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1361 1508
1362 my ($w, $h) = $self->{layout}->size; 1509 my ($w, $h) = $self->{layout}->size;
1363 1510
1364 if (exists $self->{template}) { 1511 if (exists $self->{template}) {
… …
1369 1516
1370 $w = List::Util::max $w, $w2; 1517 $w = List::Util::max $w, $w2;
1371 $h = List::Util::max $h, $h2; 1518 $h = List::Util::max $h, $h2;
1372 } 1519 }
1373 1520
1374 ( 1521 ($w, $h)
1375 $w + $self->{padding} * 2,
1376 $h + $self->{padding} * 2,
1377 )
1378} 1522}
1379 1523
1380sub size_allocate { 1524sub size_allocate {
1381 my ($self, $w, $h) = @_; 1525 my ($self, $w, $h) = @_;
1382 1526
… …
1387 my ($self, $fontsize) = @_; 1531 my ($self, $fontsize) = @_;
1388 1532
1389 $self->{fontsize} = $fontsize; 1533 $self->{fontsize} = $fontsize;
1390 delete $self->{texture}; 1534 delete $self->{texture};
1391 1535
1392 $self->update; 1536 $self->realloc;
1393 $self->check_size;
1394} 1537}
1395 1538
1396sub _draw { 1539sub _draw {
1397 my ($self) = @_; 1540 my ($self) = @_;
1398 1541
1542 $self->SUPER::_draw; # draw background, if applicable
1543
1399 my $tex = $self->{texture} ||= do { 1544 my $tex = $self->{texture} ||= do {
1545 $self->{layout}->set_foreground (@{$self->{fg}});
1400 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1546 $self->{layout}->set_font ($self->{font}) if $self->{font};
1401 $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});
1402 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1550 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1551
1403 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
1404 }; 1563 };
1405 1564
1406 glEnable GL_BLEND;
1407 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1408 glEnable GL_TEXTURE_2D; 1565 glEnable GL_TEXTURE_2D;
1409 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1566 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1410 1567
1568 if ($tex->{format} == GL_ALPHA) {
1411 glColor @{$self->{fg}}; 1569 glColor @{$self->{fg}};
1412
1413 $self->{ox} = int (
1414 $self->{align} < 0 ? $self->{padding}
1415 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1416 : ($self->{w} - $tex->{w}) * 0.5
1417 );
1418
1419 $self->{oy} = int (
1420 $self->{valign} < 0 ? $self->{padding}
1421 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1422 : ($self->{h} - $tex->{h}) * 0.5
1423 );
1424
1425 $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 }
1426 1574
1427 glDisable GL_TEXTURE_2D; 1575 glDisable GL_TEXTURE_2D;
1428 glDisable GL_BLEND;
1429} 1576}
1430 1577
1431############################################################################# 1578#############################################################################
1432 1579
1433package CFClient::UI::EntryBase; 1580package CFClient::UI::EntryBase;
… …
1446 active_fg => [0, 0, 0], 1593 active_fg => [0, 0, 0],
1447 can_hover => 1, 1594 can_hover => 1,
1448 can_focus => 1, 1595 can_focus => 1,
1449 valign => 0, 1596 valign => 0,
1450 can_events => 1, 1597 can_events => 1,
1598 #text => ...
1451 @_ 1599 @_
1452 ) 1600 )
1453} 1601}
1454 1602
1455sub _set_text { 1603sub _set_text {
… …
1465 $self->{text} = $text; 1613 $self->{text} = $text;
1466 1614
1467 $text =~ s/./*/g if $self->{hidden}; 1615 $text =~ s/./*/g if $self->{hidden};
1468 $self->{layout}->set_text ("$text "); 1616 $self->{layout}->set_text ("$text ");
1469 1617
1470 $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;
1471} 1628}
1472 1629
1473sub get_text { 1630sub get_text {
1474 $_[0]{text} 1631 $_[0]{text}
1475} 1632}
… …
1478 my ($self) = @_; 1635 my ($self) = @_;
1479 1636
1480 my ($w, $h) = $self->SUPER::size_request; 1637 my ($w, $h) = $self->SUPER::size_request;
1481 1638
1482 ($w + 1, $h) # add 1 for cursor 1639 ($w + 1, $h) # add 1 for cursor
1483}
1484
1485sub size_allocate {
1486 my ($self, $w, $h) = @_;
1487
1488 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1489}
1490
1491sub set_text {
1492 my ($self, $text) = @_;
1493
1494 $self->{cursor} = length $text;
1495 $self->_set_text ($text);
1496 $self->update;
1497} 1640}
1498 1641
1499sub key_down { 1642sub key_down {
1500 my ($self, $ev) = @_; 1643 my ($self, $ev) = @_;
1501 1644
… …
1503 my $sym = $ev->{sym}; 1646 my $sym = $ev->{sym};
1504 my $uni = $ev->{unicode}; 1647 my $uni = $ev->{unicode};
1505 1648
1506 my $text = $self->get_text; 1649 my $text = $self->get_text;
1507 1650
1508 if ($sym == 8) { 1651 if ($uni == 8) {
1509 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1652 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1510 } elsif ($sym == 127) { 1653 } elsif ($uni == 127) {
1511 substr $text, $self->{cursor}, 1, ""; 1654 substr $text, $self->{cursor}, 1, "";
1512 } elsif ($sym == CFClient::SDLK_LEFT) { 1655 } elsif ($sym == CFClient::SDLK_LEFT) {
1513 --$self->{cursor} if $self->{cursor}; 1656 --$self->{cursor} if $self->{cursor};
1514 } elsif ($sym == CFClient::SDLK_RIGHT) { 1657 } elsif ($sym == CFClient::SDLK_RIGHT) {
1515 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1658 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1516 } elsif ($sym == CFClient::SDLK_HOME) { 1659 } elsif ($sym == CFClient::SDLK_HOME) {
1517 $self->{cursor} = 0; 1660 $self->{cursor} = 0;
1518 } elsif ($sym == CFClient::SDLK_END) { 1661 } elsif ($sym == CFClient::SDLK_END) {
1519 $self->{cursor} = length $text; 1662 $self->{cursor} = length $text;
1520 } elsif ($sym == 27) { 1663 } elsif ($uni == 27) {
1521 $self->emit ('escape'); 1664 $self->_emit ('escape');
1522 } elsif ($uni) { 1665 } elsif ($uni) {
1523 substr $text, $self->{cursor}++, 0, chr $uni; 1666 substr $text, $self->{cursor}++, 0, chr $uni;
1524 } 1667 }
1525 1668
1526 $self->_set_text ($text); 1669 $self->_set_text ($text);
1527 $self->update; 1670
1671 $self->realloc;
1528} 1672}
1529 1673
1530sub focus_in { 1674sub focus_in {
1531 my ($self) = @_; 1675 my ($self) = @_;
1532 1676
… …
1612 if ($sym == 13) { 1756 if ($sym == 13) {
1613 unshift @{$self->{history}}, 1757 unshift @{$self->{history}},
1614 my $txt = $self->get_text; 1758 my $txt = $self->get_text;
1615 $self->{history_pointer} = -1; 1759 $self->{history_pointer} = -1;
1616 $self->{history_saveback} = ''; 1760 $self->{history_saveback} = '';
1617 $self->emit (activate => $txt); 1761 $self->_emit (activate => $txt);
1618 $self->update; 1762 $self->update;
1619 1763
1620 } elsif ($sym == CFClient::SDLK_UP) { 1764 } elsif ($sym == CFClient::SDLK_UP) {
1621 if ($self->{history_pointer} < 0) { 1765 if ($self->{history_pointer} < 0) {
1622 $self->{history_saveback} = $self->get_text; 1766 $self->{history_saveback} = $self->get_text;
… …
1659 1803
1660sub new { 1804sub new {
1661 my $class = shift; 1805 my $class = shift;
1662 1806
1663 $class->SUPER::new ( 1807 $class->SUPER::new (
1664 padding => 4, 1808 padding_x => 4,
1809 padding_y => 4,
1665 fg => [1, 1, 1], 1810 fg => [1, 1, 1],
1666 bg => [1, 1, 1, 0.2],
1667 active_fg => [0, 0, 1], 1811 active_fg => [0, 0, 1],
1668 can_hover => 1, 1812 can_hover => 1,
1669 align => 0, 1813 align => 0,
1670 valign => 0, 1814 valign => 0,
1671 can_events => 1, 1815 can_events => 1,
1672 @_ 1816 @_
1673 ) 1817 )
1674} 1818}
1675 1819
1820sub activate { }
1821
1676sub button_up { 1822sub button_up {
1677 my ($self, $ev, $x, $y) = @_; 1823 my ($self, $ev, $x, $y) = @_;
1678 1824
1825 $self->emit ("activate")
1679 if ($x >= 0 && $x < $self->{w} 1826 if $x >= 0 && $x < $self->{w}
1680 && $y >= 0 && $y < $self->{h}) { 1827 && $y >= 0 && $y < $self->{h};
1681 $self->emit ("activate");
1682 }
1683} 1828}
1684 1829
1685sub _draw { 1830sub _draw {
1686 my ($self) = @_; 1831 my ($self) = @_;
1687 1832
… …
1689 1834
1690 if ($GRAB == $self) { 1835 if ($GRAB == $self) {
1691 $self->{fg} = $self->{active_fg}; 1836 $self->{fg} = $self->{active_fg};
1692 } 1837 }
1693 1838
1694 glEnable GL_BLEND;
1695 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1696 glEnable GL_TEXTURE_2D; 1839 glEnable GL_TEXTURE_2D;
1697 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1840 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1698 glColor 0, 0, 0, 1; 1841 glColor 0, 0, 0, 1;
1699 1842
1700 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1843 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1701 1844
1702 glDisable GL_TEXTURE_2D; 1845 glDisable GL_TEXTURE_2D;
1703 glDisable GL_BLEND;
1704 1846
1705 $self->SUPER::_draw; 1847 $self->SUPER::_draw;
1706} 1848}
1707 1849
1708############################################################################# 1850#############################################################################
… …
1719 1861
1720sub new { 1862sub new {
1721 my $class = shift; 1863 my $class = shift;
1722 1864
1723 $class->SUPER::new ( 1865 $class->SUPER::new (
1724 padding => 2, 1866 padding_x => 2,
1867 padding_y => 2,
1725 fg => [1, 1, 1], 1868 fg => [1, 1, 1],
1726 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],
1727 state => 0, 1872 state => 0,
1728 can_hover => 1, 1873 can_hover => 1,
1729 @_ 1874 @_
1730 ) 1875 )
1731} 1876}
1732 1877
1733sub size_request { 1878sub size_request {
1734 my ($self) = @_; 1879 my ($self) = @_;
1735 1880
1736 ($self->{padding} * 2 + 6) x 2 1881 (6) x 2
1737} 1882}
1738 1883
1739sub button_down { 1884sub button_down {
1740 my ($self, $ev, $x, $y) = @_; 1885 my ($self, $ev, $x, $y) = @_;
1741 1886
1742 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1887 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1743 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1888 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1744 $self->{state} = !$self->{state}; 1889 $self->{state} = !$self->{state};
1745 $self->emit (changed => $self->{state}); 1890 $self->_emit (changed => $self->{state});
1746 } 1891 }
1747} 1892}
1748 1893
1749sub _draw { 1894sub _draw {
1750 my ($self) = @_; 1895 my ($self) = @_;
1751 1896
1752 $self->SUPER::_draw; 1897 $self->SUPER::_draw;
1753 1898
1754 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1899 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1755 1900
1756 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;
1757 1904
1758 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1905 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1759 1906
1760 glEnable GL_BLEND; 1907 my $tex = $self->{state} ? $tex[1] : $tex[0];
1908
1761 glEnable GL_TEXTURE_2D; 1909 glEnable GL_TEXTURE_2D;
1762 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1763
1764 my $tex = $self->{state} ? $tex[1] : $tex[0];
1765
1766 $tex->draw_quad (0, 0, $s, $s); 1910 $tex->draw_quad_alpha (0, 0, $s, $s);
1767
1768 glDisable GL_TEXTURE_2D; 1911 glDisable GL_TEXTURE_2D;
1769 glDisable GL_BLEND;
1770} 1912}
1771 1913
1772############################################################################# 1914#############################################################################
1773 1915
1774package CFClient::UI::Image; 1916package CFClient::UI::Image;
… …
1817 glTranslate 0, -$self->{w}, 0; 1959 glTranslate 0, -$self->{w}, 0;
1818 1960
1819 ($w, $h) = ($h, $w); 1961 ($w, $h) = ($h, $w);
1820 } 1962 }
1821 1963
1822 glEnable GL_BLEND;
1823 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1824 glEnable GL_TEXTURE_2D; 1964 glEnable GL_TEXTURE_2D;
1825 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1965 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1826 1966
1827 $tex->draw_quad (0, 0, $w, $h); 1967 $tex->draw_quad_alpha (0, 0, $w, $h);
1828 1968
1829 glDisable GL_BLEND;
1830 glDisable GL_TEXTURE_2D; 1969 glDisable GL_TEXTURE_2D;
1831} 1970}
1832 1971
1833############################################################################# 1972#############################################################################
1834 1973
… …
2023 qw(s1_slider.png s1_slider_bg.png); 2162 qw(s1_slider.png s1_slider_bg.png);
2024 2163
2025sub new { 2164sub new {
2026 my $class = shift; 2165 my $class = shift;
2027 2166
2028 # range [value, low, high, page] 2167 # range [value, low, high, page, unit]
2029 2168
2030 # TODO: 0-width page 2169 # TODO: 0-width page
2031 # TODO: req_w/h are wrong with vertical 2170 # TODO: req_w/h are wrong with vertical
2032 # TODO: calculations are off 2171 # TODO: calculations are off
2033 my $self = $class->SUPER::new ( 2172 my $self = $class->SUPER::new (
2034 fg => [1, 1, 1], 2173 fg => [1, 1, 1],
2035 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],
2036 range => [0, 0, 100, 10], 2177 range => [0, 0, 100, 10, 0],
2037 req_w => $::WIDTH / 80, 2178 min_w => $::WIDTH / 80,
2038 req_h => $::WIDTH / 80, 2179 min_h => $::WIDTH / 80,
2039 vertical => 0, 2180 vertical => 0,
2040 can_hover => 1, 2181 can_hover => 1,
2041 inner_pad => 5, 2182 inner_pad => 0.02,
2042 @_ 2183 @_
2043 ); 2184 );
2044 2185
2186 $self->set_value ($self->{range}[0]);
2187 $self->update;
2188
2045 $self 2189 $self
2046} 2190}
2047 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
2048sub size_request { 2226sub size_request {
2049 my ($self) = @_; 2227 my ($self) = @_;
2050 2228
2051 my $w = $self->{req_w}; 2229 ($self->{req_w}, $self->{req_h})
2052 my $h = $self->{req_h};
2053
2054 $self->{vertical} ? ($h, $w) : ($w, $h)
2055} 2230}
2056 2231
2057sub button_down { 2232sub button_down {
2058 my ($self, $ev, $x, $y) = @_; 2233 my ($self, $ev, $x, $y) = @_;
2059 2234
2060 $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
2061 $self->mouse_motion ($ev, $x, $y); 2239 $self->mouse_motion ($ev, $x, $y);
2062} 2240}
2063 2241
2064sub mouse_motion { 2242sub mouse_motion {
2065 my ($self, $ev, $x, $y) = @_; 2243 my ($self, $ev, $x, $y) = @_;
2066 2244
2067 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
2068 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2262 my ($value, $lo, $hi, $page) = @{$self->{range}};
2263 my $range = ($hi - $page - $lo) || 1e-100;
2069 2264
2070 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2265 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2071 2266
2072 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2267 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2073 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2268 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2074 2269
2075 $x -= $inner_pad_px; # substract the padding 2270 $value = ($value - $lo) / $range;
2076 $x = $x * ($hi - $lo) / $inner_w + $lo; 2271 $value = $value * $self->{scale} + $self->{offset};
2077 $x = $lo if $x < $lo;
2078 $x = $hi - $page if $x > $hi - $page;
2079 $self->{range}[0] = $x;
2080 2272
2081 $self->emit (changed => $x); 2273 $self->{knob_x} = $value - $knob_w * 0.5;
2082 $self->update; 2274 $self->{knob_w} = $knob_w;
2083 } 2275 });
2084}
2085 2276
2086# the inner_* stuff is for generating a padding for the slider handle, 2277 $self->SUPER::update;
2087# so that the handle doesn't leave the texture. This calculation isn't 100%
2088# correct propably, but it does the job for now
2089sub _calc_inner_pad_px {
2090 my ($self, $w) = @_;
2091 ($w / 100) * $self->{inner_pad} # % to pixels
2092} 2278}
2093 2279
2094sub _draw { 2280sub _draw {
2095 my ($self) = @_; 2281 my ($self) = @_;
2096 2282
2097 $self->SUPER::_draw (); 2283 $self->SUPER::_draw ();
2098 2284
2099 my ($w, $h) = @$self{qw(w h)}; 2285 glScale $self->{w}, $self->{h};
2100 2286
2101 if ($self->{vertical}) { 2287 if ($self->{vertical}) {
2102 # draw a vertical slider like a rotated horizontal slider 2288 # draw a vertical slider like a rotated horizontal slider
2103 2289
2290 glTranslate 1, 0, 0;
2104 glRotate 90, 0, 0, 1; 2291 glRotate 90, 0, 0, 1;
2105 glTranslate 0, -$self->{w}, 0;
2106
2107 ($w, $h) = ($h, $w);
2108 } 2292 }
2109 2293
2110 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2294 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2111 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2295 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2112 2296
2113 my ($value, $lo, $hi, $page) = @{$self->{range}};
2114
2115 $hi = $value + 1 if $lo == $hi;
2116
2117 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2118 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2119
2120 $page = int $page * $inner_w / ($hi - $lo);
2121 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2122
2123 $w -= $page;
2124 $page &= ~1;
2125 glTranslate $page * 0.5, 0, 0;
2126 $page ||= 2;
2127
2128 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2129 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2130
2131 glEnable GL_BLEND;
2132 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2133 glEnable GL_TEXTURE_2D; 2297 glEnable GL_TEXTURE_2D;
2134 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2298 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2135 2299
2136 # draw background 2300 # draw background
2137 $tex[1]->draw_quad (0, 0, $w, $h); 2301 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2138 2302
2139 # draw handle 2303 # draw handle
2140 $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);
2141 2305
2142 glDisable GL_BLEND;
2143 glDisable GL_TEXTURE_2D; 2306 glDisable GL_TEXTURE_2D;
2144} 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 (@_) }
2145 2349
2146############################################################################# 2350#############################################################################
2147 2351
2148package CFClient::UI::TextView; 2352package CFClient::UI::TextView;
2149 2353
… …
2158 fontsize => 1, 2362 fontsize => 1,
2159 can_events => 0, 2363 can_events => 0,
2160 #font => default_font 2364 #font => default_font
2161 @_, 2365 @_,
2162 2366
2163 layout => (new CFClient::Layout), 2367 layout => (new CFClient::Layout 1),
2164 par => [], 2368 par => [],
2165 height => 0, 2369 height => 0,
2166 children => [ 2370 children => [
2167 (new CFClient::UI::Empty expand => 1), 2371 (new CFClient::UI::Empty expand => 1),
2168 (new CFClient::UI::Slider vertical => 1), 2372 (new CFClient::UI::Slider vertical => 1),
… …
2179 2383
2180 $self->{fontsize} = $fontsize; 2384 $self->{fontsize} = $fontsize;
2181 $self->reflow; 2385 $self->reflow;
2182} 2386}
2183 2387
2184sub text_height {
2185 my ($self, $text) = @_;
2186
2187 my $layout = $self->{layout};
2188
2189 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2190 $layout->set_width ($self->{children}[0]{w});
2191 $layout->set_text ($text);
2192
2193 ($layout->size)[1]
2194}
2195
2196sub reflow {
2197 my ($self) = @_;
2198
2199 $self->{need_reflow}++;
2200 $self->update;
2201}
2202
2203sub size_allocate { 2388sub size_allocate {
2204 my ($self, $w, $h) = @_; 2389 my ($self, $w, $h) = @_;
2205 2390
2206 $self->SUPER::size_allocate ($w, $h); 2391 $self->SUPER::size_allocate ($w, $h);
2207 2392
… …
2210 $self->{layout}->set_width ($self->{children}[0]{w}); 2395 $self->{layout}->set_width ($self->{children}[0]{w});
2211 2396
2212 $self->reflow; 2397 $self->reflow;
2213} 2398}
2214 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
2215sub add_paragraph { 2434sub add_paragraph {
2216 my ($self, $color, $text) = @_; 2435 my ($self, $color, $text, $indent) = @_;
2217 2436
2218 #TODO: intelligently "reformat" paragraph 2437 for my $line (split /\n/, $text) {
2219 2438 my ($w, $h) = $self->text_size ($line);
2220 my $height = $self->text_height ($text);
2221
2222 $self->{height} += $height; 2439 $self->{height} += $h;
2440 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2441 }
2223 2442
2224 push @{$self->{par}}, [$height, $color, $text];
2225
2226 $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]);
2227 $self->{children}[1]->update;
2228} 2444}
2229 2445
2230sub update { 2446sub update {
2231 my ($self) = @_; 2447 my ($self) = @_;
2232 2448
… …
2234 2450
2235 return unless $self->{h} > 0; 2451 return unless $self->{h} > 0;
2236 2452
2237 delete $self->{texture}; 2453 delete $self->{texture};
2238 2454
2239 $ROOT->on_refresh ($self, sub { 2455 $ROOT->on_post_alloc ($self, sub {
2456 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2457
2240 if (delete $self->{need_reflow}) { 2458 if (delete $self->{need_reflow}) {
2241 my $height = 0; 2459 my $height = 0;
2242 2460
2243 $height += $_->[0] = $self->text_height ($_->[2]) 2461 my $layout = $self->{layout};
2462
2463 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2464
2244 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 }
2245 2476
2246 $self->{height} = $height; 2477 $self->{height} = $height;
2247 2478
2248 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2479 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2249 2480
2250 delete $self->{texture}; 2481 delete $self->{texture};
2251 } 2482 }
2252 2483
2253 $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 {
2254 glClearColor 0, 0, 0, 0; 2485 glClearColor 0.5, 0.5, 0.5, 0;
2255 glClear GL_COLOR_BUFFER_BIT; 2486 glClear GL_COLOR_BUFFER_BIT;
2256 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
2257 glEnable GL_BLEND; 2499 glEnable GL_BLEND;
2500 #TODO# not correct in windows where rgba is forced off
2258 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2501 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2259 glEnable GL_TEXTURE_2D;
2260 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2261
2262 my $top = int $self->{children}[1]{range}[0];
2263
2264 my $y0 = $top;
2265 my $y1 = $top + $self->{h};
2266
2267 my $y = 0;
2268
2269 my $layout = $self->{layout};
2270
2271 $layout->set_font ($self->{font}) if $self->{font};
2272 2502
2273 for my $par (@{$self->{par}}) { 2503 for my $par (@{$self->{par}}) {
2274 my $h = $par->[0]; 2504 my $h = $par->[1];
2275 2505
2276 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]);
2277 $layout->set_text ($par->[2]); 2509 $layout->set_markup ($par->[4]);
2278 2510
2279 glColor @{ $par->[1] }; 2511 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2280 my ($W, $H) = $layout->size; 2512
2281 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;
2282 } 2515 }
2283 2516
2284 $y += $h; 2517 $y += $h;
2285 } 2518 }
2286 2519
2287 glDisable GL_TEXTURE_2D;
2288 glDisable GL_BLEND; 2520 glDisable GL_BLEND;
2289 }; 2521 };
2290 }); 2522 });
2291} 2523}
2292 2524
2293sub _draw { 2525sub _draw {
2294 my ($self) = @_; 2526 my ($self) = @_;
2295 2527
2296 glEnable GL_BLEND;
2297 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2298 glEnable GL_TEXTURE_2D; 2528 glEnable GL_TEXTURE_2D;
2299 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2529 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2300 glColor 1, 1, 1, 1; 2530 glColor 1, 1, 1, 1;
2301 $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});
2302 glDisable GL_TEXTURE_2D; 2532 glDisable GL_TEXTURE_2D;
2303 glDisable GL_BLEND;
2304 2533
2305 $self->{children}[1]->draw; 2534 $self->{children}[1]->draw;
2306 2535
2307} 2536}
2308 2537
… …
2356 2585
2357sub new { 2586sub new {
2358 my $class = shift; 2587 my $class = shift;
2359 2588
2360 my $self = $class->SUPER::new ( 2589 my $self = $class->SUPER::new (
2361 state => 0, 2590 state => 0,
2362 connect_activate => \&toggle_flopper, 2591 on_activate => \&toggle_flopper,
2363 @_ 2592 @_
2364 ); 2593 );
2365 2594
2366 if ($self->{state}) {
2367 $self->{state} = 0;
2368 $self->toggle_flopper;
2369 }
2370
2371 $self 2595 $self
2372} 2596}
2373 2597
2374sub toggle_flopper { 2598sub toggle_flopper {
2375 my ($self) = @_; 2599 my ($self) = @_;
2376 2600
2377 # TODO: use animation 2601 $self->{other}->toggle_visibility;
2378 if ($self->{state} = !$self->{state}) {
2379 $CFClient::UI::ROOT->add ($self->{other});
2380 $self->{other}->move ($self->coord2global (0, $self->{h}));
2381 $self->emit ("open");
2382 } else {
2383 $CFClient::UI::ROOT->remove ($self->{other});
2384 $self->emit ("close");
2385 }
2386
2387 $self->emit (changed => $self->{state});
2388} 2602}
2389 2603
2390############################################################################# 2604#############################################################################
2391 2605
2392package CFClient::UI::Tooltip; 2606package CFClient::UI::Tooltip;
… …
2402 @_, 2616 @_,
2403 can_events => 0, 2617 can_events => 0,
2404 ) 2618 )
2405} 2619}
2406 2620
2407sub set_markup { 2621sub set_tooltip_from {
2408 my ($self, $text) = @_; 2622 my ($self, $widget) = @_;
2409 2623
2410 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2624 my $tooltip = $widget->{tooltip};
2411 $self->{label}->set_markup ($text); 2625
2412 $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 );
2413} 2641}
2414 2642
2415sub size_request { 2643sub size_request {
2416 my ($self) = @_; 2644 my ($self) = @_;
2417
2418 $self->child->set_max_size ($::WIDTH * 0.3);
2419 2645
2420 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2646 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2421 2647
2422 ($w + 4, $h + 4) 2648 ($w + 4, $h + 4)
2423} 2649}
… …
2426 my ($self, $w, $h) = @_; 2652 my ($self, $w, $h) = @_;
2427 2653
2428 $self->SUPER::size_allocate ($w - 4, $h - 4); 2654 $self->SUPER::size_allocate ($w - 4, $h - 4);
2429} 2655}
2430 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
2431sub _draw { 2675sub _draw {
2432 my ($self) = @_; 2676 my ($self) = @_;
2433 2677
2434 glPushMatrix;
2435 glTranslate 0.375, 0.375; 2678 glTranslate 0.375, 0.375;
2436 2679
2437 my ($w, $h) = @$self{qw(w h)}; 2680 my ($w, $h) = @$self{qw(w h)};
2438 2681
2439 glColor 1, 0.8, 0.4; 2682 glColor 1, 0.8, 0.4;
… …
2450 glVertex 0 , $h; 2693 glVertex 0 , $h;
2451 glVertex $w, $h; 2694 glVertex $w, $h;
2452 glVertex $w, 0; 2695 glVertex $w, 0;
2453 glEnd; 2696 glEnd;
2454 2697
2455 glPopMatrix; 2698 glTranslate 2 - 0.375, 2 - 0.375;
2456 2699
2457 glTranslate 2, 2;
2458 $self->SUPER::_draw; 2700 $self->SUPER::_draw;
2459} 2701}
2460 2702
2461############################################################################# 2703#############################################################################
2462 2704
… …
2467use CFClient::OpenGL; 2709use CFClient::OpenGL;
2468 2710
2469sub new { 2711sub new {
2470 my $class = shift; 2712 my $class = shift;
2471 2713
2472 $class->SUPER::new ( 2714 my $self = $class->SUPER::new (
2473 aspect => 1, 2715 aspect => 1,
2716 can_events => 0,
2474 @_, 2717 @_,
2475 ) 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
2476} 2735}
2477 2736
2478sub size_request { 2737sub size_request {
2479 (32, 8) 2738 (32, 8)
2480} 2739}
2481 2740
2741sub update {
2742 my ($self) = @_;
2743
2744 return unless $self->{visible};
2745
2746 $self->SUPER::update;
2747}
2748
2482sub _draw { 2749sub _draw {
2483 my ($self) = @_; 2750 my ($self) = @_;
2484 2751
2485 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
2486 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2763 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2487 2764
2488 # TODO animation
2489 if ($tex) { 2765 if ($tex) {
2490 glEnable GL_BLEND;
2491 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2492 glEnable GL_TEXTURE_2D; 2766 glEnable GL_TEXTURE_2D;
2493 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2767 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2494 glColor 1, 1, 1, 1; 2768 glColor 1, 1, 1, 1;
2495 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2769 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2496 glDisable GL_TEXTURE_2D; 2770 glDisable GL_TEXTURE_2D;
2497 glDisable GL_BLEND;
2498 } 2771 }
2772}
2773
2774sub DESTROY {
2775 my ($self) = @_;
2776
2777 $self->{timer}->cancel
2778 if $self->{timer};
2779
2780 $self->SUPER::DESTROY;
2499} 2781}
2500 2782
2501############################################################################# 2783#############################################################################
2502 2784
2503package CFClient::UI::InventoryItem; 2785package CFClient::UI::Inventory;
2504 2786
2505our @ISA = CFClient::UI::HBox::; 2787our @ISA = CFClient::UI::ScrolledWindow::;
2506 2788
2507sub new { 2789sub new {
2508 my $class = shift; 2790 my $class = shift;
2509 2791
2510 my %args = @_;
2511
2512 my $item = $args{item};
2513
2514 my $desc = $item->{nrof} < 2
2515 ? $item->{name}
2516 : "$item->{nrof} $item->{name_pl}";
2517
2518
2519 my $self = $class->SUPER::new ( 2792 my $self = $class->SUPER::new (
2520 can_hover => 1, 2793 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2521 can_events => 1,
2522 tooltip => (CFClient::UI::Label->escape ($desc)
2523 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2524 connect_button_down => sub {
2525 my ($self, $ev, $x, $y) = @_;
2526
2527 # todo: maybe put examine on 1? but should just be a tooltip :(
2528 if ($ev->{button} == 1) {
2529 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2530 } elsif ($ev->{button} == 2) {
2531 $::CONN->send ("apply $item->{tag}");
2532 } elsif ($ev->{button} == 3) {
2533 CFClient::UI::Menu->new (
2534 items => [
2535 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2536 [
2537 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2538 sub { $::CONN->send ("lock $item->{tag}") },
2539 ],
2540 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2541 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2542 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2543 ],
2544 )->popup ($ev);
2545 }
2546
2547 1
2548 },
2549 %args
2550 );
2551 $self->add(new CFClient::UI::Face
2552 can_events => 0,
2553 face => $item->{face},
2554 anim => $item->{anim},
2555 animspeed => $item->{animspeed});
2556 $self->add(new CFClient::UI::Label
2557 can_events => 0,
2558 text => $desc);
2559
2560 $self
2561}
2562
2563#############################################################################
2564
2565package CFClient::UI::Inventory;
2566
2567our @ISA = CFClient::UI::ScrolledWindow::;
2568
2569sub new {
2570 my $class = shift;
2571
2572 my $self = $class->SUPER::new (
2573 scrolled => (new CFClient::UI::VBox),
2574 @_, 2794 @_,
2575 ); 2795 );
2576 2796
2577 $self 2797 $self
2578} 2798}
… …
2581 my ($self, $items) = @_; 2801 my ($self, $items) = @_;
2582 2802
2583 $self->{scrolled}->clear; 2803 $self->{scrolled}->clear;
2584 return unless $items; 2804 return unless $items;
2585 2805
2586 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;
2587 2810
2588 $self->{real_items} = \@items; 2811 $self->{real_items} = \@items;
2589 2812
2813 my $row = 0;
2590 for my $item (@items) { 2814 for my $item (@items) {
2591 my $desc = $item->{nrof} < 2 2815 CFClient::Item::update_widgets $item;
2592 ? $item->{name}
2593 : "$item->{nrof} $item->{name_pl}";
2594 2816
2595 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item); 2817 $self->{scrolled}->add (0, $row, $item->{face_widget});
2596 } 2818 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2819 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2597 2820
2598# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2821 $row++;
2599} 2822 }
2600
2601sub size_request {
2602 my ($self) = @_;
2603 ($self->{req_w}, $self->{req_h});
2604} 2823}
2605 2824
2606############################################################################# 2825#############################################################################
2607 2826
2608package CFClient::UI::Menu; 2827package CFClient::UI::Menu;
… …
2643 2862
2644# 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)
2645sub popup { 2864sub popup {
2646 my ($self, $ev) = @_; 2865 my ($self, $ev) = @_;
2647 2866
2648 $self->emit ("popdown"); 2867 $self->_emit ("popdown");
2649 2868
2650 # maybe save $GRAB? must be careful about events... 2869 # maybe save $GRAB? must be careful about events...
2651 $GRAB = $self; 2870 $GRAB = $self;
2652 $self->{button} = $ev->{button}; 2871 $self->{button} = $ev->{button};
2653 2872
2654 $self->show; 2873 $self->show;
2655 $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);
2656} 2875}
2657 2876
2658sub mouse_motion { 2877sub mouse_motion {
2659 my ($self, $ev, $x, $y) = @_; 2878 my ($self, $ev, $x, $y) = @_;
2660 2879
… …
2668 2887
2669 if ($ev->{button} == $self->{button}) { 2888 if ($ev->{button} == $self->{button}) {
2670 undef $GRAB; 2889 undef $GRAB;
2671 $self->hide; 2890 $self->hide;
2672 2891
2673 $self->emit ("popdown"); 2892 $self->_emit ("popdown");
2674 $self->{hover}[1]->() if $self->{hover}; 2893 $self->{hover}[1]->() if $self->{hover};
2675 } 2894 }
2676} 2895}
2677 2896
2678############################################################################# 2897#############################################################################
2679 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
2680package CFClient::UI::Root; 3009package CFClient::UI::Root;
2681 3010
2682our @ISA = CFClient::UI::Container::; 3011our @ISA = CFClient::UI::Container::;
2683 3012
2684use CFClient::OpenGL; 3013use CFClient::OpenGL;
2685 3014
2686sub check_size { 3015sub new {
2687 my ($self) = @_; 3016 my $class = shift;
2688 3017
2689 $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
2690} 3026}
2691 3027
2692sub size_request { 3028sub size_request {
2693 my ($self) = @_; 3029 my ($self) = @_;
2694 3030
2695 ($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
2696} 3046}
2697 3047
2698sub size_allocate { 3048sub size_allocate {
2699 my ($self, $w, $h) = @_; 3049 my ($self, $w, $h) = @_;
2700 3050
2701 my $old_w = $self->{old_w};
2702 my $old_h = $self->{old_h};
2703
2704 if ($old_w && $old_h) {
2705 for my $child ($self->children) {
2706 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2707 $child->{w} = int 0.5 + $child->{req_w} * $w / $old_w;
2708 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2709 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2710 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2711 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2712 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2713 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2714 }
2715 }
2716
2717 $self->{old_w} = $w;
2718 $self->{old_h} = $h;
2719}
2720
2721sub configure {
2722 my ($self, $x, $y, $w, $h) = @_;
2723
2724 $self->SUPER::configure ($x, $y, $w, $h);
2725
2726 for my $child ($self->children) { 3051 for my $child ($self->children) {
2727 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)};
2728 3053
2729 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3054 $X = $child->{force_x} if exists $child->{force_x};
2730 $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
2731 $child->configure ($X, $Y, $W, $H); 3060 $child->configure ($X, $Y, $W, $H);
2732 } 3061 }
2733} 3062}
2734 3063
2735sub _topleft { 3064sub coord2local {
2736 my ($self, $x, $y) = @_; 3065 my ($self, $x, $y) = @_;
2737 3066
2738 ($x, $y) 3067 ($x, $y)
2739} 3068}
2740 3069
3070sub coord2global {
3071 my ($self, $x, $y) = @_;
3072
3073 ($x, $y)
3074}
3075
2741sub update { 3076sub update {
2742 my ($self) = @_; 3077 my ($self) = @_;
2743 3078
2744 $self->check_size; 3079 $::WANT_REFRESH++;
2745 ::refresh ();
2746} 3080}
2747 3081
2748sub add { 3082sub add {
2749 my ($self, $child) = @_; 3083 my ($self, @children) = @_;
2750 3084
2751 # integerize window positions 3085 $_->{is_toplevel} = 1
2752 $child->{x} = int $child->{x}; 3086 for @children;
2753 $child->{y} = int $child->{y};
2754 3087
2755 $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 }
2756} 3104}
2757 3105
2758sub on_refresh { 3106sub on_refresh {
2759 my ($self, $id, $cb) = @_; 3107 my ($self, $id, $cb) = @_;
2760 3108
2761 $self->{refresh_hook}{$id} = $cb; 3109 $self->{refresh_hook}{$id} = $cb;
2762} 3110}
2763 3111
3112sub on_post_alloc {
3113 my ($self, $id, $cb) = @_;
3114
3115 $self->{post_alloc_hook}{$id} = $cb;
3116}
3117
2764sub draw { 3118sub draw {
2765 my ($self) = @_; 3119 my ($self) = @_;
2766 3120
2767 while (my $rcb = delete $self->{refresh_hook}) { 3121 while ($self->{refresh_hook}) {
2768 $_->() for values %$rcb; 3122 $_->()
3123 for values %{delete $self->{refresh_hook}};
2769 } 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
2770 3199
2771 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3200 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2772 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3201 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2773 glClear GL_COLOR_BUFFER_BIT; 3202 glClear GL_COLOR_BUFFER_BIT;
2774 3203
2775 glMatrixMode GL_PROJECTION; 3204 glMatrixMode GL_PROJECTION;
2776 glLoadIdentity; 3205 glLoadIdentity;
2777 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3206 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2778 glMatrixMode GL_MODELVIEW; 3207 glMatrixMode GL_MODELVIEW;
2779 glLoadIdentity; 3208 glLoadIdentity;
2780 3209
2781 $self->_draw; 3210 $self->_draw;
2782} 3211}
… …
2784############################################################################# 3213#############################################################################
2785 3214
2786package CFClient::UI; 3215package CFClient::UI;
2787 3216
2788$ROOT = new CFClient::UI::Root; 3217$ROOT = new CFClient::UI::Root;
2789$TOOLTIP = new CFClient::UI::Tooltip; 3218$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2790 3219
27911 32201
2792 3221

Diff Legend

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