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.256 by root, Tue May 30 01:42:16 2006 UTC

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

Diff Legend

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