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

Diff Legend

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