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.155 by root, Sun Apr 23 02:22:54 2006 UTC vs.
Revision 1.273 by root, Sat Jun 3 02:32:35 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;
15 18
19our %WIDGET; # all widgets, weak-referenced
20
21sub get_layout {
22 my $layout;
23
24 for (grep { $_->{name} } values %WIDGET) {
25 my $win = $layout->{$_->{name}} = { };
26
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
31
32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
36}
37
38sub set_layout {
39 my ($layout) = @_;
40
41 $LAYOUT = $layout;
42}
43
16sub check_tooltip { 44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
17 if (!$GRAB) { 47 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (exists $widget->{tooltip}) { 49 if (length $widget->{tooltip}) {
20
21 if ($TOOLTIP->{owner} != $widget) { 50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
22 $TOOLTIP->{owner} = $widget; 53 $TOOLTIP->{owner} = $widget;
23 54
24 my $tip = $widget->{tooltip}; 55 my $tip = $widget->{tooltip};
25 56
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 57 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 58
28 $TOOLTIP->set_text ($widget->{tooltip}); 59 $TOOLTIP->set_tooltip_from ($widget);
29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
30 $TOOLTIP->show; 60 $TOOLTIP->show;
31 } 61 }
32 62
33 return; 63 return;
34 } 64 }
… …
39 delete $TOOLTIP->{owner}; 69 delete $TOOLTIP->{owner};
40} 70}
41 71
42# class methods for events 72# class methods for events
43sub feed_sdl_key_down_event { 73sub feed_sdl_key_down_event {
44 $FOCUS->key_down ($_[0]) if $FOCUS; 74 $FOCUS->emit (key_down => $_[0])
75 if $FOCUS;
45} 76}
46 77
47sub feed_sdl_key_up_event { 78sub feed_sdl_key_up_event {
48 $FOCUS->key_up ($_[0]) if $FOCUS; 79 $FOCUS->emit (key_up => $_[0])
80 if $FOCUS;
49} 81}
50 82
51sub feed_sdl_button_down_event { 83sub feed_sdl_button_down_event {
52 my ($ev) = @_; 84 my ($ev) = @_;
53 my ($x, $y) = ($ev->{x}, $ev->{y}); 85 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
61 check_tooltip; 93 check_tooltip;
62 } 94 }
63 95
64 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 96 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
65 97
66 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
99 if $GRAB;
67} 100}
68 101
69sub feed_sdl_button_up_event { 102sub feed_sdl_button_up_event {
70 my ($ev) = @_; 103 my ($ev) = @_;
71 my ($x, $y) = ($ev->{x}, $ev->{y}); 104 my ($x, $y) = ($ev->{x}, $ev->{y});
72 105
73 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 106 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
74 107
75 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
76 109
77 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
111 if $GRAB;
78 112
79 if (!$BUTTON_STATE) { 113 if (!$BUTTON_STATE) {
80 my $grab = $GRAB; undef $GRAB; 114 my $grab = $GRAB; undef $GRAB;
81 $grab->update if $grab; 115 $grab->update if $grab;
82 $GRAB->update if $GRAB; 116 $GRAB->update if $GRAB;
… …
98 $HOVER->update if $HOVER && $HOVER->{can_hover}; 132 $HOVER->update if $HOVER && $HOVER->{can_hover};
99 133
100 check_tooltip; 134 check_tooltip;
101 } 135 }
102 136
103 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
138 if $HOVER;
104} 139}
105 140
106# convert position array to integers 141# convert position array to integers
107sub harmonize { 142sub harmonize {
108 my ($vals) = @_; 143 my ($vals) = @_;
… …
114 $rem += $_ - $i; 149 $rem += $_ - $i;
115 $_ = $i; 150 $_ = $i;
116 } 151 }
117} 152}
118 153
154sub full_refresh {
155 # make a copy, otherwise for complains about freed values.
156 my @widgets = values %WIDGET;
157
158 $_->update
159 for @widgets;
160}
161
162sub reconfigure_widgets {
163 # make a copy, otherwise C<for> complains about freed values.
164 my @widgets = values %WIDGET;
165
166 $_->reconfigure
167 for @widgets;
168}
169
170# call when resolution changes etc.
171sub rescale_widgets {
172 my ($sx, $sy) = @_;
173
174 for my $widget (values %WIDGET) {
175 if ($widget->{is_toplevel}) {
176 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
178
179 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
180 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
181 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
182 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
183 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
184 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
185
186 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
188
189 }
190 }
191
192 reconfigure_widgets;
193}
194
119############################################################################# 195#############################################################################
120 196
121package CFClient::UI::Base; 197package CFClient::UI::Base;
122 198
123use strict; 199use strict;
… …
126 202
127sub new { 203sub new {
128 my $class = shift; 204 my $class = shift;
129 205
130 my $self = bless { 206 my $self = bless {
131 x => 0, 207 x => "center",
132 y => 0, 208 y => "center",
133 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
134 can_events => 1, 212 can_events => 1,
135 @_ 213 @_
136 }, $class; 214 }, $class;
137 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
138 for (keys %$self) { 218 for (keys %$self) {
139 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
140 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
141 } 221 }
142 } 222 }
143 223
224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
228 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
229
230 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232
233 $self->show if $layout->{show};
234 }
235
144 $self 236 $self
145} 237}
146 238
239sub destroy {
240 my ($self) = @_;
241
242 $self->hide;
243 %$self = ();
244}
245
147sub show { 246sub show {
148 my ($self) = @_; 247 my ($self) = @_;
149 248
150 return if $self->{parent}; 249 return if $self->{parent};
151 250
152 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
153} 252}
154 253
254sub set_visible {
255 my ($self) = @_;
256
257 return if $self->{visible};
258
259 $self->{root} = $self->{parent}{root};
260 $self->{visible} = $self->{parent}{visible} + 1;
261
262 $self->emit (visibility_change => 1);
263
264 $self->realloc if !exists $self->{req_w};
265
266 $_->set_visible for $self->children;
267}
268
269sub set_invisible {
270 my ($self) = @_;
271
272 return unless $self->{visible};
273
274 $_->set_invisible for $self->children;
275
276 delete $self->{root};
277 delete $self->{visible};
278
279 undef $GRAB if $GRAB == $self;
280 undef $HOVER if $HOVER == $self;
281
282 CFClient::UI::check_tooltip
283 if $TOOLTIP->{owner} == $self;
284
285 $self->focus_out;
286
287 $self->emit (visibility_change => 0);
288}
289
290sub set_visibility {
291 my ($self, $visible) = @_;
292
293 return if $self->{visible} == $visible;
294
295 $visible ? $self->hide
296 : $self->show;
297}
298
299sub toggle_visibility {
300 my ($self) = @_;
301
302 $self->{visible}
303 ? $self->hide
304 : $self->show;
305}
306
155sub hide { 307sub hide {
156 my ($self) = @_; 308 my ($self) = @_;
157 309
158 return unless $self->{parent}; 310 $self->set_invisible;
159 311
160 $self->{parent}->remove ($self); 312 $self->{parent}->remove ($self)
313 if $self->{parent};
161} 314}
162 315
163sub move { 316sub move_abs {
164 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
165 318
166 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
167 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
168 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
169 322
170 $self->update; 323 $self->update;
171} 324}
172 325
173sub needs_redraw { 326sub set_size {
174 0 327 my ($self, $w, $h) = @_;
328
329 $self->{force_w} = $w;
330 $self->{force_h} = $h;
331
332 $self->realloc;
175} 333}
176 334
177sub size_request { 335sub size_request {
178 require Carp; 336 require Carp;
179 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
181 339
182sub configure { 340sub configure {
183 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
184 342
185 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
186 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
187 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
188 348
189 # use alignment to adjust x, y 349 # use alignment to adjust x, y
190 350
191 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
192 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
193
194 ($w, $h) = ($w2, $h2);
195 } 353 }
196 354
197 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
198 $self->{x} = $x; 356 $self->{x} = $x;
199 $self->{y} = $y; 357 $self->{y} = $y;
200 $self->update; 358 $self->update;
201 } 359 }
202 360
203 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
362 return unless $self->{visible};
363
204 $self->{w} = $w; 364 $self->{alloc_w} = $w;
205 $self->{h} = $h; 365 $self->{alloc_h} = $h;
206 366
207 $self->size_allocate ($w, $h); 367 $self->{root}{size_alloc}{$self+0} = $self;
208 $self->update;
209 } 368 }
210} 369}
211 370
212sub size_allocate { 371sub size_allocate {
213 # nothing to be done 372 # nothing to be done
214} 373}
215 374
216# return top left coordinates 375sub children {
217sub _topleft { 376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
381}
382
383sub set_max_size {
218 my ($self, $x, $y) = @_; 384 my ($self, $w, $h) = @_;
219 385
220 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 386 delete $self->{max_w}; $self->{max_w} = $w if $w;
387 delete $self->{max_h}; $self->{max_h} = $h if $h;
388}
389
390sub set_tooltip {
391 my ($self, $tooltip) = @_;
392
393 $tooltip =~ s/^\s+//;
394 $tooltip =~ s/\s+$//;
395
396 return if $self->{tooltip} eq $tooltip;
397
398 $self->{tooltip} = $tooltip;
399
400 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
401 delete $CFClient::UI::TOOLTIP->{owner};
402 CFClient::UI::check_tooltip;
403 }
221} 404}
222 405
223# translate global coordinates to local coordinate system 406# translate global coordinates to local coordinate system
224sub coord2local { 407sub coord2local {
225 my ($self, $x, $y) = @_; 408 my ($self, $x, $y) = @_;
226 409
227 my ($X, $Y) = $self->_topleft; 410 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
228 ($x - $X, $y - $Y)
229} 411}
230 412
231# translate local coordinates to global coordinate system 413# translate local coordinates to global coordinate system
232sub coord2global { 414sub coord2global {
233 my ($self, $x, $y) = @_; 415 my ($self, $x, $y) = @_;
234 416
235 my ($X, $Y) = $self->_topleft; 417 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
236 ($x + $X, $y + $Y)
237} 418}
238 419
239sub focus_in { 420sub focus_in {
240 my ($self) = @_; 421 my ($self) = @_;
241 422
242 return if $FOCUS == $self; 423 return if $FOCUS == $self;
243 return unless $self->{can_focus}; 424 return unless $self->{can_focus};
244 425
245 my $focus = $FOCUS; $FOCUS = $self; 426 my $focus = $FOCUS; $FOCUS = $self;
246 427
247 $self->emit (focus_in => $focus); 428 $self->_emit (focus_in => $focus);
248 429
249 $focus->update if $focus; 430 $focus->update if $focus;
250 $FOCUS->update; 431 $FOCUS->update;
251} 432}
252 433
… …
255 436
256 return unless $FOCUS == $self; 437 return unless $FOCUS == $self;
257 438
258 my $focus = $FOCUS; undef $FOCUS; 439 my $focus = $FOCUS; undef $FOCUS;
259 440
260 $self->emit (focus_out => $focus); 441 $self->_emit (focus_out => $focus);
261 442
262 $focus->update if $focus; #? 443 $focus->update if $focus; #?
263}
264 444
445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
446 unless $FOCUS;
447}
448
265sub mouse_motion { } 449sub mouse_motion { 0 }
266sub button_up { } 450sub button_up { 0 }
267sub key_down { } 451sub key_down { 0 }
268sub key_up { } 452sub key_up { 0 }
269 453
270sub button_down { 454sub button_down {
271 my ($self, $ev, $x, $y) = @_; 455 my ($self, $ev, $x, $y) = @_;
272 456
273 $self->focus_in; 457 $self->focus_in;
274}
275 458
276sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 459 0
277sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 460}
278sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 461
279sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 462sub find_widget {
280sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 463 my ($self, $x, $y) = @_;
464
465 return () unless $self->{can_events};
466
467 return $self
468 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
469 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
470
471 ()
472}
473
474sub set_parent {
475 my ($self, $parent) = @_;
476
477 Scalar::Util::weaken ($self->{parent} = $parent);
478 $self->set_visible if $parent->{visible};
479}
480
481sub connect {
482 my ($self, $signal, $cb) = @_;
483
484 push @{ $self->{signal_cb}{$signal} }, $cb;
485}
486
487sub _emit {
488 my ($self, $signal, @args) = @_;
489
490 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
491}
492
493sub emit {
494 my ($self, $signal, @args) = @_;
495
496 $self->_emit ($signal, @args)
497 || $self->$signal (@args);
498}
499
500sub visibility_change {
501 #my ($self, $visible) = @_;
502}
503
504sub realloc {
505 my ($self) = @_;
506
507 if ($self->{visible}) {
508 return if $self->{root}{realloc}{$self+0};
509
510 $self->{root}{realloc}{$self+0} = $self;
511 $self->{root}->update;
512 } else {
513 delete $self->{req_w};
514 delete $self->{req_h};
515 }
516}
517
518sub update {
519 my ($self) = @_;
520
521 $self->{parent}->update
522 if $self->{parent};
523}
524
525sub reconfigure {
526 my ($self) = @_;
527
528 $self->realloc;
529 $self->update;
530}
531
532# using global variables seems a bit hacky, but passing through all drawing
533# functions seems pointless.
534our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
281 535
282sub draw { 536sub draw {
283 my ($self) = @_; 537 my ($self) = @_;
284 538
285 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
540
541 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y};
544 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546
547 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
286 550
287 glPushMatrix; 551 glPushMatrix;
288 glTranslate $self->{x}, $self->{y}, 0; 552 glTranslate $self->{x}, $self->{y}, 0;
289 $self->_draw; 553 $self->_draw;
290 glPopMatrix; 554 glPopMatrix;
… …
301 glVertex $x + $self->{w}, $y + $self->{h}; 565 glVertex $x + $self->{w}, $y + $self->{h};
302 glVertex $x , $y + $self->{h}; 566 glVertex $x , $y + $self->{h};
303 glEnd; 567 glEnd;
304 glDisable GL_BLEND; 568 glDisable GL_BLEND;
305 } 569 }
570
571 if ($ENV{CFPLUS_DEBUG} & 1) {
572 glPushMatrix;
573 glColor 1, 1, 0, 1;
574 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
575 glBegin GL_LINE_LOOP;
576 glVertex 0 , 0;
577 glVertex $self->{w} - 1, 0;
578 glVertex $self->{w} - 1, $self->{h} - 1;
579 glVertex 0 , $self->{h} - 1;
580 glEnd;
581 glPopMatrix;
582 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
583 }
306} 584}
307 585
308sub _draw { 586sub _draw {
309 my ($self) = @_; 587 my ($self) = @_;
310 588
311 warn "no draw defined for $self\n"; 589 warn "no draw defined for $self\n";
312} 590}
313 591
314sub find_widget {
315 my ($self, $x, $y) = @_;
316
317 return () unless $self->{can_events};
318
319 return $self
320 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
321 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
322
323 ()
324}
325
326sub set_parent {
327 my ($self, $parent) = @_;
328
329 Scalar::Util::weaken ($self->{parent} = $parent);
330}
331
332sub check_size {
333 my ($self) = @_;
334
335 return unless $self->{parent};
336
337 my ($w, $h) = $self->size_request;
338
339 if ($w != $self->{req_w} || $h != $self->{req_h}) {
340 $self->{req_w} = $w;
341 $self->{req_h} = $h;
342
343 $self->{parent}->check_size;
344 }
345}
346
347sub update {
348 my ($self) = @_;
349
350 $self->{parent}->update
351 if $self->{parent};
352}
353
354sub connect {
355 my ($self, $signal, $cb) = @_;
356
357 push @{ $self->{signal_cb}{$signal} }, $cb;
358}
359
360sub emit {
361 my ($self, $signal, @args) = @_;
362
363 for my $cb (@{$self->{signal_cb}{$signal} || []}) {
364 $cb->($self, @args);
365 }
366}
367
368sub DESTROY { 592sub DESTROY {
369 my ($self) = @_; 593 my ($self) = @_;
370 594
595 delete $WIDGET{$self+0};
371 #$self->deactivate; 596 #$self->deactivate;
372} 597}
373 598
374############################################################################# 599#############################################################################
375 600
… …
384 my $class = shift; 609 my $class = shift;
385 610
386 # range [value, low, high, page] 611 # range [value, low, high, page]
387 612
388 $class->SUPER::new ( 613 $class->SUPER::new (
389 bg => [0, 0, 0, 0.2], 614 #bg => [0, 0, 0, 0.2],
390 active_bg => [1, 1, 1, 0.5], 615 #active_bg => [1, 1, 1, 0.5],
391 @_ 616 @_
392 ) 617 )
393} 618}
394 619
395sub _draw { 620sub _draw {
396 my ($self) = @_; 621 my ($self) = @_;
397 622
623 my $color = $FOCUS == $self && $self->{active_bg}
624 ? $self->{active_bg}
625 : $self->{bg};
626
627 if ($color && (@$color < 4 || $color->[3])) {
398 my ($w, $h) = @$self{qw(w h)}; 628 my ($w, $h) = @$self{qw(w h)};
399 629
400 glEnable GL_BLEND; 630 glEnable GL_BLEND;
401 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 631 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
402 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 632 glColor @$color;
403 633
404 glBegin GL_QUADS; 634 glBegin GL_QUADS;
405 glVertex 0 , 0; 635 glVertex 0 , 0;
406 glVertex 0 , $h; 636 glVertex 0 , $h;
407 glVertex $w, $h; 637 glVertex $w, $h;
408 glVertex $w, 0; 638 glVertex $w, 0;
409 glEnd; 639 glEnd;
410 640
411 glDisable GL_BLEND; 641 glDisable GL_BLEND;
642 }
412} 643}
413 644
414############################################################################# 645#############################################################################
415 646
416package CFClient::UI::Empty; 647package CFClient::UI::Empty;
… …
421 my ($class, %arg) = @_; 652 my ($class, %arg) = @_;
422 $class->SUPER::new (can_events => 0, %arg); 653 $class->SUPER::new (can_events => 0, %arg);
423} 654}
424 655
425sub size_request { 656sub size_request {
426 (0, 0) 657 my ($self) = @_;
658
659 ($self->{w} + 0, $self->{h} + 0)
427} 660}
428 661
429sub draw { } 662sub draw { }
430 663
431############################################################################# 664#############################################################################
… …
435our @ISA = CFClient::UI::Base::; 668our @ISA = CFClient::UI::Base::;
436 669
437sub new { 670sub new {
438 my ($class, %arg) = @_; 671 my ($class, %arg) = @_;
439 672
440 my $children = delete $arg{children} || []; 673 my $children = delete $arg{children};
441 674
442 my $self = $class->SUPER::new (children => [], can_events => 0, %arg); 675 my $self = $class->SUPER::new (
676 children => [],
677 can_events => 0,
678 %arg,
679 );
680
443 $self->add ($_) for @$children; 681 $self->add (@$children)
682 if $children;
444 683
445 $self 684 $self
446} 685}
447 686
448sub add { 687sub add {
449 my ($self, $child) = @_; 688 my ($self, @widgets) = @_;
450 689
451 $child->set_parent ($self); 690 $_->set_parent ($self)
691 for @widgets;
452 692
453 use sort 'stable'; 693 use sort 'stable';
454 694
455 $self->{children} = [ 695 $self->{children} = [
456 sort { $a->{z} <=> $b->{z} } 696 sort { $a->{z} <=> $b->{z} }
457 @{$self->{children}}, $child 697 @{$self->{children}}, @widgets
458 ]; 698 ];
459 699
460 $child->check_size; 700 $self->realloc;
701}
702
703sub children {
704 @{ $_[0]{children} }
461} 705}
462 706
463sub remove { 707sub remove {
464 my ($self, $child) = @_; 708 my ($self, $child) = @_;
465 709
466 delete $child->{parent}; 710 delete $child->{parent};
711 $child->hide;
467 712
468 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 713 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
469 714
470 $self->check_size; 715 $self->realloc;
471 $self->update; 716}
717
718sub clear {
719 my ($self) = @_;
720
721 my $children = delete $self->{children};
722 $self->{children} = [];
723
724 for (@$children) {
725 delete $_->{parent};
726 $_->hide;
727 }
728
729 $self->realloc;
472} 730}
473 731
474sub find_widget { 732sub find_widget {
475 my ($self, $x, $y) = @_; 733 my ($self, $x, $y) = @_;
476 734
477 $x -= $self->{x}; 735 $x -= $self->{x};
478 $y -= $self->{y}; 736 $y -= $self->{y};
479 737
480 my $res; 738 my $res;
481 739
482 for (reverse @{ $self->{children} }) { 740 for (reverse $self->visible_children) {
483 $res = $_->find_widget ($x, $y) 741 $res = $_->find_widget ($x, $y)
484 and return $res; 742 and return $res;
485 } 743 }
486 744
487 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 745 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
551} 809}
552 810
553sub update { 811sub update {
554 my ($self) = @_; 812 my ($self) = @_;
555 813
556 # we want to do this delayed... 814 $ROOT->on_post_alloc ($self => sub { $self->render_child });
557 $self->render_chld;
558 $self->SUPER::update; 815 $self->SUPER::update;
559}
560
561sub render_chld {
562 my ($self) = @_;
563
564 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
565 glClearColor 0, 0, 0, 1;
566 glClear GL_COLOR_BUFFER_BIT;
567 $self->child->draw;
568 };
569} 816}
570 817
571sub size_allocate { 818sub size_allocate {
572 my ($self, $w, $h) = @_; 819 my ($self, $w, $h) = @_;
573 820
574 $self->child->configure (0, 0, $w, $h); 821 $self->SUPER::size_allocate ($w, $h);
822 $self->update;
823}
575 824
825sub _render {
826 my ($self) = @_;
827
828 $self->{children}[0]->draw;
829}
830
831sub render_child {
832 my ($self) = @_;
833
834 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
835 glClearColor 0, 0, 0, 0;
836 glClear GL_COLOR_BUFFER_BIT;
837
838 {
839 package CFClient::UI::Base;
840
841 ($draw_x, $draw_y, $draw_w, $draw_h) =
842 (0, 0, $self->{w}, $self->{h});
843 }
844
576 $self->render_chld; 845 $self->_render;
846 };
577} 847}
578 848
579sub _draw { 849sub _draw {
580 my ($self) = @_; 850 my ($self) = @_;
581 851
582 my ($w, $h) = ($self->w, $self->h); 852 my ($w, $h) = @$self{qw(w h)};
583 853
584 my $tex = $self->{texture} 854 my $tex = $self->{texture}
585 or return; 855 or return;
586 856
587 glEnable GL_BLEND;
588 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
589 glEnable GL_TEXTURE_2D; 857 glEnable GL_TEXTURE_2D;
590 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 858 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
859 glColor 1, 1, 1, 1;
591 860
592 $tex->draw_quad (0, 0, $w, $h); 861 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
593 862
594 glDisable GL_BLEND;
595 glDisable GL_TEXTURE_2D; 863 glDisable GL_TEXTURE_2D;
596} 864}
597 865
598############################################################################# 866#############################################################################
599 867
600package CFClient::UI::ViewPort; 868package CFClient::UI::ViewPort;
601 869
602our @ISA = CFClient::UI::Window::; 870our @ISA = CFClient::UI::Window::;
603
604sub new { die }
605
606sub size_request {
607 my ($self) = @_;
608
609 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
610 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
611
612 @$self{qw(child_w child_h)}
613}
614
615sub _draw {
616 my ($self) = @_;
617
618 $self->{children}[1]->draw;
619}
620
621
622#############################################################################
623
624package CFClient::UI::Frame;
625
626our @ISA = CFClient::UI::Bin::;
627
628use CFClient::OpenGL;
629 871
630sub new { 872sub new {
631 my $class = shift; 873 my $class = shift;
632 874
633 my $self = $class->SUPER::new ( 875 $class->SUPER::new (
634 bg => [1, 1, 1, 1], 876 scroll_x => 0,
635 border_bg => [1, 1, 1, 1], 877 scroll_y => 1,
636 border => 0.8,
637 @_ 878 @_,
638 ); 879 )
639
640 $self
641}
642
643sub set_size {
644 my ($self, $w, $h) = @_;
645 $self->{req_w} = $w;
646 $self->{req_h} = $h;
647 $self->check_size;
648} 880}
649 881
650sub size_request { 882sub size_request {
651 my ($self) = @_; 883 my ($self) = @_;
652 ($self->{req_w}, $self->{req_h}) 884
885 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
886
887 $w = 10 if $self->{scroll_x};
888 $h = 10 if $self->{scroll_y};
889
890 ($w, $h)
653} 891}
654 892
655sub size_allocate { 893sub size_allocate {
656 my ($self, $w, $h) = @_; 894 my ($self, $w, $h) = @_;
657 $self->{w} = $w; 895
658 $self->{h} = $h; 896 my $child = $self->child;
897
898 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
899 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
900
659 $self->child->configure (0, 0, $w, $h); 901 $self->child->configure (0, 0, $w, $h);
902 $self->update;
660} 903}
661 904
662sub _draw { 905sub set_offset {
663 my ($self) = @_; 906 my ($self, $x, $y) = @_;
664 907
665 my ($w, $h) = ($self->{w}, $self->{h}); 908 $self->{view_x} = int $x;
909 $self->{view_y} = int $y;
666 910
667 glEnable GL_BLEND; 911 $self->update;
668 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 912}
669 glEnable GL_TEXTURE_2D;
670 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
671 913
672# glBegin GL_QUADS; 914# hmm, this does not work for topleft of $self... but we should not ask for that
673# glColor 0, 0, 0, 0; 915sub coord2local {
674# glVertex 0 , 0; 916 my ($self, $x, $y) = @_;
675# glVertex 0 , $h;
676# glVertex $w, $h;
677# glVertex $w, 0;
678# glEnd;
679 917
918 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
919}
680 920
681 $self->child->draw; 921sub coord2global {
682 glDisable GL_BLEND; 922 my ($self, $x, $y) = @_;
683 glDisable GL_TEXTURE_2D; 923
924 $x = List::Util::min $self->{w}, $x - $self->{view_x};
925 $y = List::Util::min $self->{h}, $y - $self->{view_y};
926
927 $self->SUPER::coord2global ($x, $y)
928}
929
930sub find_widget {
931 my ($self, $x, $y) = @_;
932
933 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
934 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
935 ) {
936 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
937 } else {
938 $self->CFClient::UI::Base::find_widget ($x, $y)
939 }
940}
941
942sub _render {
943 my ($self) = @_;
944
945 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
946 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
947
948 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
949
950 $self->SUPER::_render;
684} 951}
685 952
686############################################################################# 953#############################################################################
687 954
955package CFClient::UI::ScrolledWindow;
956
957our @ISA = CFClient::UI::HBox::;
958
959sub new {
960 my ($class, %arg) = @_;
961
962 my $child = delete $arg{child};
963
964 my $self;
965
966 my $slider = new CFClient::UI::Slider
967 vertical => 1,
968 range => [0, 0, 1, 0.01], # HACK fix
969 on_changed => sub {
970 $self->{vp}->set_offset (0, $_[1]);
971 },
972 ;
973
974 $self = $class->SUPER::new (
975 vp => (new CFClient::UI::ViewPort expand => 1),
976 slider => $slider,
977 %arg,
978 );
979
980 $self->SUPER::add ($self->{vp}, $self->{slider});
981 $self->add ($child) if $child;
982
983 $self
984}
985
986sub add {
987 my ($self, $widget) = @_;
988
989 $self->{vp}->add ($self->{child} = $widget);
990}
991
992sub update {
993 my ($self) = @_;
994
995 $self->SUPER::update;
996
997 # todo: overwrite size_allocate of child
998 my $child = $self->{vp}->child;
999 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1000}
1001
1002sub size_allocate {
1003 my ($self, $w, $h) = @_;
1004
1005 $self->SUPER::size_allocate ($w, $h);
1006
1007 my $child = $self->{vp}->child;
1008 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1009}
1010
1011#TODO# update range on size_allocate depending on child
1012# update viewport offset on scroll
1013
1014#############################################################################
1015
688package CFClient::UI::FancyFrame; 1016package CFClient::UI::Frame;
689 1017
690our @ISA = CFClient::UI::Bin::; 1018our @ISA = CFClient::UI::Bin::;
691 1019
692use CFClient::OpenGL; 1020use CFClient::OpenGL;
693
694my @tex =
695 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
696 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
697 1021
698sub new { 1022sub new {
699 my $class = shift; 1023 my $class = shift;
700 1024
701 # TODO: user_x, user_y, overwrite moveto? 1025 $class->SUPER::new (
1026 bg => undef,
1027 @_,
1028 )
1029}
1030
1031sub _draw {
1032 my ($self) = @_;
1033
1034 if ($self->{bg}) {
1035 my ($w, $h) = @$self{qw(w h)};
1036
1037 glEnable GL_BLEND;
1038 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1039 glColor @{ $self->{bg} };
1040
1041 glBegin GL_QUADS;
1042 glVertex 0 , 0;
1043 glVertex 0 , $h;
1044 glVertex $w, $h;
1045 glVertex $w, 0;
1046 glEnd;
1047
1048 glDisable GL_BLEND;
1049 }
1050
1051 $self->SUPER::_draw;
1052}
1053
1054#############################################################################
1055
1056package CFClient::UI::FancyFrame;
1057
1058our @ISA = CFClient::UI::Bin::;
1059
1060use CFClient::OpenGL;
1061
1062my $bg =
1063 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1064 mipmap => 1, wrap => 1;
1065
1066my @border =
1067 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1068 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1069
1070sub new {
1071 my ($class, %arg) = @_;
1072
1073 my $title = delete $arg{title};
702 1074
703 my $self = $class->SUPER::new ( 1075 my $self = $class->SUPER::new (
704 bg => [1, 1, 1, 1], 1076 bg => [1, 1, 1, 1],
705 border_bg => [1, 1, 1, 1], 1077 border_bg => [1, 1, 1, 1],
706 border => 0.8, 1078 border => 0.6,
707 can_events => 1, 1079 can_events => 1,
708 @_ 1080 min_w => 16,
1081 min_h => 16,
1082 %arg,
709 ); 1083 );
710 1084
711 $self->{title} &&= new CFClient::UI::Label 1085 $self->{title} = new CFClient::UI::Label
712 align => 0, 1086 align => 0,
713 valign => 1, 1087 valign => 1,
714 text => $self->{title}, 1088 text => $title,
715 fontsize => 1; 1089 fontsize => $self->{border}
1090 if defined $title;
716 1091
717 $self 1092 $self
1093}
1094
1095sub add {
1096 my ($self, @widgets) = @_;
1097
1098 $self->SUPER::add (@widgets);
1099 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
718} 1100}
719 1101
720sub border { 1102sub border {
721 int $_[0]{border} * $::FONTSIZE 1103 int $_[0]{border} * $::FONTSIZE
722} 1104}
723 1105
724sub size_request { 1106sub size_request {
725 my ($self) = @_; 1107 my ($self) = @_;
726 1108
727 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h}; 1109 $self->{title}->size_request
1110 if $self->{title};
728 1111
729 my ($w, $h) = $self->SUPER::size_request; 1112 my ($w, $h) = $self->SUPER::size_request;
730 1113
731 ( 1114 (
732 $w + $self->border * 2, 1115 $w + $self->border * 2,
… …
735} 1118}
736 1119
737sub size_allocate { 1120sub size_allocate {
738 my ($self, $w, $h) = @_; 1121 my ($self, $w, $h) = @_;
739 1122
1123 if ($self->{title}) {
1124 $self->{title}{w} = $w;
1125 $self->{title}{h} = $h;
1126 $self->{title}->size_allocate ($w, $h);
1127 }
1128
1129 my $border = $self->border;
1130
740 $h -= List::Util::max 0, $self->border * 2; 1131 $h -= List::Util::max 0, $border * 2;
741 $w -= List::Util::max 0, $self->border * 2; 1132 $w -= List::Util::max 0, $border * 2;
742 1133
743 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
744 if $self->{title};
745
746 $self->child->configure ($self->border, $self->border, $w, $h); 1134 $self->child->configure ($border, $border, $w, $h);
747} 1135}
748 1136
749sub button_down { 1137sub button_down {
750 my ($self, $ev, $x, $y) = @_; 1138 my ($self, $ev, $x, $y) = @_;
751 1139
1140 my ($w, $h) = @$self{qw(w h)};
752 my $border = $self->border; 1141 my $border = $self->border;
753 1142
754 if ($x < $self->{w} && $x >= $self->{w} - $border 1143 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
755 && $y < $self->{h} && $y >= $self->{h} - $border) { 1144 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
756 1145
1146 if ($lr & $td) {
1147 my ($wx, $wy) = ($self->{x}, $self->{y});
757 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1148 my ($ox, $oy) = ($ev->{x}, $ev->{y});
758 my ($bw, $bh) = ($self->{w}, $self->{h}); 1149 my ($bw, $bh) = ($self->{w}, $self->{h});
759 1150
1151 my $mx = $x < $border;
1152 my $my = $y < $border;
1153
760 $self->{motion} = sub { 1154 $self->{motion} = sub {
761 my ($ev, $x, $y) = @_; 1155 my ($ev, $x, $y) = @_;
762 1156
763 ($x, $y) = ($ev->{x}, $ev->{y}); 1157 my $dx = $ev->{x} - $ox;
1158 my $dy = $ev->{y} - $oy;
764 1159
765 $self->{user_w} = $bw + $x - $ox; 1160 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
766 $self->{user_h} = $bh + $y - $oy; 1161 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
767 $self->check_size; 1162
1163 $self->realloc;
1164 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
768 }; 1165 };
769 1166
770 } elsif ($x >= 0 && $x < $self->{w} 1167 } elsif ($lr ^ $td) {
771 && $y >= 0 && $y < $border) {
772
773 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1168 my ($ox, $oy) = ($ev->{x}, $ev->{y});
774 my ($bx, $by) = ($self->{x}, $self->{y}); 1169 my ($bx, $by) = ($self->{x}, $self->{y});
775 1170
776 $self->{motion} = sub { 1171 $self->{motion} = sub {
777 my ($ev, $x, $y) = @_; 1172 my ($ev, $x, $y) = @_;
778 1173
779 ($x, $y) = ($ev->{x}, $ev->{y}); 1174 ($x, $y) = ($ev->{x}, $ev->{y});
780 1175
781 $self->move ($bx + $x - $ox, $by + $y - $oy); 1176 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
782 $self->update;
783 }; 1177 };
1178 } else {
1179 return 0;
1180 }
1181
784 } 1182 1
785} 1183}
786 1184
787sub button_up { 1185sub button_up {
788 my ($self, $ev, $x, $y) = @_; 1186 my ($self, $ev, $x, $y) = @_;
789 1187
790 delete $self->{motion}; 1188 !!delete $self->{motion}
791} 1189}
792 1190
793sub mouse_motion { 1191sub mouse_motion {
794 my ($self, $ev, $x, $y) = @_; 1192 my ($self, $ev, $x, $y) = @_;
795 1193
796 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1194 $self->{motion}->($ev, $x, $y) if $self->{motion};
1195
1196 !!$self->{motion}
797} 1197}
798 1198
799sub _draw { 1199sub _draw {
800 my ($self) = @_; 1200 my ($self) = @_;
801 1201
1202 my $child = $self->{children}[0];
1203
802 my ($w, $h ) = ($self->{w}, $self->{h}); 1204 my ($w, $h ) = ($self->{w}, $self->{h});
803 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1205 my ($cw, $ch) = ($child->{w}, $child->{h});
804 1206
805 glEnable GL_BLEND;
806 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
807 glEnable GL_TEXTURE_2D; 1207 glEnable GL_TEXTURE_2D;
808 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1208 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
809 1209
810 my $border = $self->border; 1210 my $border = $self->border;
811 1211
812 glColor @{ $self->{border_bg} }; 1212 glColor @{ $self->{border_bg} };
813 $tex[1]->draw_quad (0, 0, $w, $border); 1213 $border[0]->draw_quad_alpha (0, 0, $w, $border);
814 $tex[3]->draw_quad (0, $border, $border, $ch); 1214 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
815 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1215 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
816 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1216 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
817 1217
818 my $bg = $tex[0]; 1218 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1219 glColor @{ $self->{bg} };
819 1220
820 # TODO: repeat texture not scale 1221 # TODO: repeat texture not scale
821 my $rep_x = $cw / $bg->{w}; 1222 # solve this better(?)
822 my $rep_y = $ch / $bg->{h}; 1223 $bg->{s} = $cw / $bg->{w};
823 1224 $bg->{t} = $ch / $bg->{h};
824 glColor @{ $self->{bg} };
825
826 $bg->{s} = $rep_x;
827 $bg->{t} = $rep_y;
828 $bg->{wrap_mode} = 1;
829 $bg->draw_quad ($border, $border, $cw, $ch); 1225 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1226 }
830 1227
831 glDisable GL_TEXTURE_2D; 1228 glDisable GL_TEXTURE_2D;
832 glDisable GL_BLEND;
833 1229
834 $self->{title}->draw if $self->{title};
835 $self->child->draw; 1230 $child->draw;
1231
1232 if ($self->{title}) {
1233 glTranslate 0, $border - $self->{h};
1234 $self->{title}->_draw;
1235 }
836} 1236}
837 1237
838############################################################################# 1238#############################################################################
839 1239
840package CFClient::UI::Table; 1240package CFClient::UI::Table;
… …
848sub new { 1248sub new {
849 my $class = shift; 1249 my $class = shift;
850 1250
851 $class->SUPER::new ( 1251 $class->SUPER::new (
852 col_expand => [], 1252 col_expand => [],
853 @_ 1253 @_,
854 ) 1254 )
1255}
1256
1257sub children {
1258 grep $_, map @$_, grep $_, @{ $_[0]{children} }
855} 1259}
856 1260
857sub add { 1261sub add {
858 my ($self, $x, $y, $child) = @_; 1262 my ($self, $x, $y, $child) = @_;
859 1263
860 $child->set_parent ($self); 1264 $child->set_parent ($self);
861 $self->{children}[$y][$x] = $child; 1265 $self->{children}[$y][$x] = $child;
862 1266
863 $child->check_size; 1267 $self->realloc;
864} 1268}
865 1269
866# TODO: move to container class maybe? send childs a signal on removal? 1270# TODO: move to container class maybe? send children a signal on removal?
867sub clear { 1271sub clear {
868 my ($self) = @_; 1272 my ($self) = @_;
869 1273
1274 my @children = $self->children;
870 delete $self->{children}; 1275 delete $self->{children};
871 $self->update; 1276
1277 for (@children) {
1278 delete $_->{parent};
1279 $_->hide;
1280 }
1281
1282 $self->realloc;
872} 1283}
873 1284
874sub get_wh { 1285sub get_wh {
875 my ($self) = @_; 1286 my ($self) = @_;
876 1287
… …
907sub size_allocate { 1318sub size_allocate {
908 my ($self, $w, $h) = @_; 1319 my ($self, $w, $h) = @_;
909 1320
910 my ($ws, $hs) = $self->get_wh; 1321 my ($ws, $hs) = $self->get_wh;
911 1322
912 my $req_w = sum @$ws; 1323 my $req_w = (sum @$ws) || 1;
913 my $req_h = sum @$hs; 1324 my $req_h = (sum @$hs) || 1;
914 1325
915 # TODO: nicer code && do row_expand 1326 # TODO: nicer code && do row_expand
916 my @col_expand = @{$self->{col_expand}}; 1327 my @col_expand = @{$self->{col_expand}};
917 @col_expand = (1) x @$ws unless @col_expand; 1328 @col_expand = (1) x @$ws unless @col_expand;
918 my $col_expand = (sum @col_expand) || 1; 1329 my $col_expand = (sum @col_expand) || 1;
… …
972 } 1383 }
973} 1384}
974 1385
975############################################################################# 1386#############################################################################
976 1387
977package CFClient::UI::HBox; 1388package CFClient::UI::Box;
978
979# TODO: wrap into common Box base class
980 1389
981our @ISA = CFClient::UI::Container::; 1390our @ISA = CFClient::UI::Container::;
982 1391
983sub size_request { 1392sub size_request {
984 my ($self) = @_; 1393 my ($self) = @_;
985 1394
986 my @alloc = map [$_->size_request], @{$self->{children}}; 1395 $self->{vertical}
987 1396 ? (
988 ( 1397 (List::Util::max map $_->{req_w}, @{$self->{children}}),
989 (List::Util::sum map $_->[0], @alloc), 1398 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
990 (List::Util::max map $_->[1], @alloc), 1399 )
991 ) 1400 : (
1401 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1402 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1403 )
992} 1404}
993 1405
994sub size_allocate { 1406sub size_allocate {
995 my ($self, $w, $h) = @_; 1407 my ($self, $w, $h) = @_;
996 1408
997 ($h, $w) = ($w, $h); 1409 my $space = $self->{vertical} ? $h : $w;
998
999 my $children = $self->{children}; 1410 my $children = $self->{children};
1000 1411
1001 my @h = map $_->{req_w}, @$children; 1412 my @req;
1002 1413
1003 my $req_h = List::Util::sum @h; 1414 if ($self->{homogeneous}) {
1004 1415 @req = ($space / (@$children || 1)) x @$children;
1005 if ($req_h > $h) {
1006 # ah well, not enough space
1007 $_ *= $h / $req_h for @h;
1008 } else { 1416 } else {
1417 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1418 my $req = List::Util::sum @req;
1419
1420 if ($req > $space) {
1421 # ah well, not enough space
1422 $_ *= $space / $req for @req;
1423 } else {
1009 my $exp = List::Util::sum map $_->{expand}, @$children; 1424 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1010 $exp ||= 1;
1011 1425
1426 $space = ($space - $req) / $expand; # remaining space to give away
1427
1428 $req[$_] += $space * $children->[$_]{expand}
1012 for (0 .. $#$children) { 1429 for 0 .. $#$children;
1013 my $child = $children->[$_];
1014
1015 my $alloc_h = $h[$_];
1016 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1017 $h[$_] = $alloc_h;
1018 } 1430 }
1019 } 1431 }
1020 1432
1021 CFClient::UI::harmonize \@h; 1433 CFClient::UI::harmonize \@req;
1022 1434
1023 my $y = 0; 1435 my $pos = 0;
1024 for (0 .. $#$children) { 1436 for (0 .. $#$children) {
1025 my $child = $children->[$_];
1026 my $h = $h[$_]; 1437 my $alloc = $req[$_];
1027 $child->configure ($y, 0, $h, $w); 1438 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1028 1439
1029 $y += $h; 1440 $pos += $alloc;
1030 } 1441 }
1031 1442
1032 1 1443 1
1033} 1444}
1034 1445
1035############################################################################# 1446#############################################################################
1036 1447
1448package CFClient::UI::HBox;
1449
1450our @ISA = CFClient::UI::Box::;
1451
1452sub new {
1453 my $class = shift;
1454
1455 $class->SUPER::new (
1456 vertical => 0,
1457 @_,
1458 )
1459}
1460
1461#############################################################################
1462
1037package CFClient::UI::VBox; 1463package CFClient::UI::VBox;
1038 1464
1039# TODO: wrap into common Box base class
1040
1041our @ISA = CFClient::UI::Container::; 1465our @ISA = CFClient::UI::Box::;
1042 1466
1043sub size_request { 1467sub new {
1044 my ($self) = @_; 1468 my $class = shift;
1045 1469
1046 my @alloc = map [$_->size_request], @{$self->{children}}; 1470 $class->SUPER::new (
1047 1471 vertical => 1,
1048 ( 1472 @_,
1049 (List::Util::max map $_->[0], @alloc),
1050 (List::Util::sum map $_->[1], @alloc),
1051 ) 1473 )
1052} 1474}
1053 1475
1054sub size_allocate {
1055 my ($self, $w, $h) = @_;
1056
1057 my $children = $self->{children};
1058
1059 my @h = map $_->{req_h}, @$children;
1060
1061 my $req_h = List::Util::sum @h;
1062
1063 if ($req_h > $h) {
1064 # ah well, not enough space
1065 $_ *= $h / $req_h for @h;
1066 } else {
1067 my $exp = List::Util::sum map $_->{expand}, @$children;
1068 $exp ||= 1;
1069
1070 for (0 .. $#$children) {
1071 my $child = $children->[$_];
1072
1073 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1074 }
1075 }
1076
1077 CFClient::UI::harmonize \@h;
1078
1079 my $y = 0;
1080 for (0 .. $#$children) {
1081 my $child = $children->[$_];
1082 my $h = $h[$_];
1083 $child->configure (0, $y, $w, $h);
1084
1085 $y += $h;
1086 }
1087
1088 1
1089}
1090
1091############################################################################# 1476#############################################################################
1092 1477
1093package CFClient::UI::Label; 1478package CFClient::UI::Label;
1094 1479
1095our @ISA = CFClient::UI::Base::; 1480our @ISA = CFClient::UI::DrawBG::;
1096 1481
1097use CFClient::OpenGL; 1482use CFClient::OpenGL;
1098 1483
1099sub new { 1484sub new {
1100 my ($class, %arg) = @_; 1485 my ($class, %arg) = @_;
1101 1486
1102 my $self = $class->SUPER::new ( 1487 my $self = $class->SUPER::new (
1103 fg => [1, 1, 1], 1488 fg => [1, 1, 1],
1489 #bg => none
1490 #active_bg => none
1491 #font => default_font
1492 #text => initial text
1493 #markup => initial narkup
1494 #max_w => maximum pixel width
1495 ellipsise => 3, # end
1496 layout => (new CFClient::Layout),
1104 fontsize => 1, 1497 fontsize => 1,
1105 text => "",
1106 align => -1, 1498 align => -1,
1107 valign => -1, 1499 valign => -1,
1108 padding => 2, 1500 padding_x => 2,
1109 layout => new CFClient::Layout, 1501 padding_y => 2,
1110 can_events => 0, 1502 can_events => 0,
1111 %arg 1503 %arg
1112 ); 1504 );
1113 1505
1114 if (exists $self->{template}) { 1506 if (exists $self->{template}) {
1115 my $layout = new CFClient::Layout; 1507 my $layout = new CFClient::Layout;
1116 $layout->set_text (delete $self->{template}); 1508 $layout->set_text (delete $self->{template});
1117 $self->{template} = $layout; 1509 $self->{template} = $layout;
1118 } 1510 }
1119 1511
1120 $self->set_text (delete $self->{text}) if exists $self->{text}; 1512 if (exists $self->{markup}) {
1121 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1513 $self->set_markup (delete $self->{markup});
1514 } else {
1515 $self->set_text (delete $self->{text});
1516 }
1122 1517
1123 $self 1518 $self
1124} 1519}
1125 1520
1126sub escape_text { 1521sub escape($) {
1127 local $_ = $_[1]; 1522 local $_ = $_[0];
1128 1523
1129 s/&/&amp;/g; 1524 s/&/&amp;/g;
1130 s/>/&gt;/g; 1525 s/>/&gt;/g;
1131 s/</&lt;/g; 1526 s/</&lt;/g;
1132 1527
1133 $_[1] 1528 $_
1529}
1530
1531sub update {
1532 my ($self) = @_;
1533
1534 delete $self->{texture};
1535 $self->SUPER::update;
1134} 1536}
1135 1537
1136sub set_text { 1538sub set_text {
1137 my ($self, $text) = @_; 1539 my ($self, $text) = @_;
1138 1540
1541 return if $self->{text} eq "T$text";
1542 $self->{text} = "T$text";
1543
1544 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1139 $self->{layout}->set_text ($text); 1545 $self->{layout}->set_text ($text);
1140 1546
1141 delete $self->{texture}; 1547 $self->realloc;
1142 $self->check_size;
1143 $self->update; 1548 $self->update;
1144} 1549}
1145 1550
1146sub set_markup { 1551sub set_markup {
1147 my ($self, $markup) = @_; 1552 my ($self, $markup) = @_;
1148 1553
1554 return if $self->{text} eq "M$markup";
1555 $self->{text} = "M$markup";
1556
1557 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1558
1559 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1149 $self->{layout}->set_markup ($markup); 1560 $self->{layout}->set_markup ($markup);
1150 1561
1151 delete $self->{texture}; 1562 $self->realloc;
1152 $self->check_size;
1153 $self->update; 1563 $self->update;
1154} 1564}
1155 1565
1156sub size_request { 1566sub size_request {
1157 my ($self) = @_; 1567 my ($self) = @_;
1158 1568
1159 $self->{layout}->set_width; 1569 $self->{layout}->set_font ($self->{font}) if $self->{font};
1570 $self->{layout}->set_width ($self->{max_w} || -1);
1571 $self->{layout}->set_ellipsise ($self->{ellipsise});
1572 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1160 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1573 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1161 1574
1162 my ($w, $h) = $self->{layout}->size; 1575 my ($w, $h) = $self->{layout}->size;
1163 1576
1164 if (exists $self->{template}) { 1577 if (exists $self->{template}) {
1578 $self->{template}->set_font ($self->{font}) if $self->{font};
1165 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1579 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1166 1580
1167 my ($w2, $h2) = $self->{template}->size; 1581 my ($w2, $h2) = $self->{template}->size;
1168 1582
1169 $w = List::Util::max $w, $w2; 1583 $w = List::Util::max $w, $w2;
1170 $h = List::Util::max $h, $h2; 1584 $h = List::Util::max $h, $h2;
1171 } 1585 }
1172 1586
1173 ( 1587 ($w, $h)
1174 $w + $self->{padding} * 2,
1175 $h + $self->{padding} * 2,
1176 )
1177} 1588}
1178 1589
1179sub size_allocate { 1590sub size_allocate {
1180 my ($self, $w, $h) = @_; 1591 my ($self, $w, $h) = @_;
1181 1592
1593 delete $self->{ox};
1594
1182 delete $self->{texture}; 1595 delete $self->{texture}
1596 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1183} 1597}
1184 1598
1185sub set_fontsize { 1599sub set_fontsize {
1186 my ($self, $fontsize) = @_; 1600 my ($self, $fontsize) = @_;
1187 1601
1188 $self->{fontsize} = $fontsize; 1602 $self->{fontsize} = $fontsize;
1189 delete $self->{texture}; 1603 delete $self->{texture};
1190 $self->check_size; 1604
1191 $self->update; 1605 $self->realloc;
1192} 1606}
1193 1607
1194sub _draw { 1608sub _draw {
1195 my ($self) = @_; 1609 my ($self) = @_;
1196 1610
1611 $self->SUPER::_draw; # draw background, if applicable
1612
1197 my $tex = $self->{texture} ||= do { 1613 my $tex = $self->{texture} ||= do {
1614 $self->{layout}->set_foreground (@{$self->{fg}});
1615 $self->{layout}->set_font ($self->{font}) if $self->{font};
1198 $self->{layout}->set_width ($self->{w}); 1616 $self->{layout}->set_width ($self->{w});
1617 $self->{layout}->set_ellipsise ($self->{ellipsise});
1618 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1199 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1619 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1620
1200 new_from_layout CFClient::Texture $self->{layout} 1621 new_from_layout CFClient::Texture $self->{layout}
1201 }; 1622 };
1202 1623
1203 glEnable GL_BLEND; 1624 unless (exists $self->{ox}) {
1204 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1625 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1626 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1627 : ($self->{w} - $tex->{w}) * 0.5);
1628
1629 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1630 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1631 : ($self->{h} - $tex->{h}) * 0.5);
1632 };
1633
1205 glEnable GL_TEXTURE_2D; 1634 glEnable GL_TEXTURE_2D;
1206 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1635 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1207 1636
1637 if ($tex->{format} == GL_ALPHA) {
1208 glColor @{$self->{fg}}; 1638 glColor @{$self->{fg}};
1209
1210 $self->{ox} = int (
1211 $self->{align} < 0 ? $self->{padding}
1212 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1213 : ($self->{w} - $tex->{w}) * 0.5
1214 );
1215
1216 $self->{oy} = int (
1217 $self->{valign} < 0 ? $self->{padding}
1218 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1219 : ($self->{h} - $tex->{h}) * 0.5
1220 );
1221
1222 $tex->draw_quad ($self->{ox}, $self->{oy}); 1639 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1640 } else {
1641 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1642 }
1223 1643
1224 glDisable GL_TEXTURE_2D; 1644 glDisable GL_TEXTURE_2D;
1225 glDisable GL_BLEND;
1226} 1645}
1227 1646
1228############################################################################# 1647#############################################################################
1229 1648
1230package CFClient::UI::EntryBase; 1649package CFClient::UI::EntryBase;
… …
1235 1654
1236sub new { 1655sub new {
1237 my $class = shift; 1656 my $class = shift;
1238 1657
1239 $class->SUPER::new ( 1658 $class->SUPER::new (
1240 fg => [1, 1, 1], 1659 fg => [1, 1, 1],
1241 bg => [0, 0, 0, 0.2], 1660 bg => [0, 0, 0, 0.2],
1242 active_bg => [1, 1, 1, 0.5], 1661 active_bg => [1, 1, 1, 0.5],
1243 active_fg => [0, 0, 0], 1662 active_fg => [0, 0, 0],
1244 can_hover => 1, 1663 can_hover => 1,
1245 can_focus => 1, 1664 can_focus => 1,
1246 valign => 0, 1665 valign => 0,
1247 can_events => 1, 1666 can_events => 1,
1667 #text => ...
1248 @_ 1668 @_
1249 ) 1669 )
1250} 1670}
1251 1671
1252sub _set_text { 1672sub _set_text {
… …
1262 $self->{text} = $text; 1682 $self->{text} = $text;
1263 1683
1264 $text =~ s/./*/g if $self->{hidden}; 1684 $text =~ s/./*/g if $self->{hidden};
1265 $self->{layout}->set_text ("$text "); 1685 $self->{layout}->set_text ("$text ");
1266 1686
1267 $self->emit (changed => $self->{text}); 1687 $self->_emit (changed => $self->{text});
1688}
1689
1690sub set_text {
1691 my ($self, $text) = @_;
1692
1693 $self->{cursor} = length $text;
1694 $self->_set_text ($text);
1695
1696 $self->realloc;
1268} 1697}
1269 1698
1270sub get_text { 1699sub get_text {
1271 $_[0]{text} 1700 $_[0]{text}
1272} 1701}
… …
1275 my ($self) = @_; 1704 my ($self) = @_;
1276 1705
1277 my ($w, $h) = $self->SUPER::size_request; 1706 my ($w, $h) = $self->SUPER::size_request;
1278 1707
1279 ($w + 1, $h) # add 1 for cursor 1708 ($w + 1, $h) # add 1 for cursor
1280}
1281
1282sub size_allocate {
1283 my ($self, $w, $h) = @_;
1284
1285 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1286}
1287
1288sub set_text {
1289 my ($self, $text) = @_;
1290
1291 $self->{cursor} = length $text;
1292 $self->_set_text ($text);
1293 $self->update;
1294} 1709}
1295 1710
1296sub key_down { 1711sub key_down {
1297 my ($self, $ev) = @_; 1712 my ($self, $ev) = @_;
1298 1713
… …
1300 my $sym = $ev->{sym}; 1715 my $sym = $ev->{sym};
1301 my $uni = $ev->{unicode}; 1716 my $uni = $ev->{unicode};
1302 1717
1303 my $text = $self->get_text; 1718 my $text = $self->get_text;
1304 1719
1305 if ($sym == 8) { 1720 if ($uni == 8) {
1306 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1721 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1307 } elsif ($sym == 127) { 1722 } elsif ($uni == 127) {
1308 substr $text, $self->{cursor}, 1, ""; 1723 substr $text, $self->{cursor}, 1, "";
1309 } elsif ($sym == CFClient::SDLK_LEFT) { 1724 } elsif ($sym == CFClient::SDLK_LEFT) {
1310 --$self->{cursor} if $self->{cursor}; 1725 --$self->{cursor} if $self->{cursor};
1311 } elsif ($sym == CFClient::SDLK_RIGHT) { 1726 } elsif ($sym == CFClient::SDLK_RIGHT) {
1312 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1727 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1313 } elsif ($sym == CFClient::SDLK_HOME) { 1728 } elsif ($sym == CFClient::SDLK_HOME) {
1314 $self->{cursor} = 0; 1729 $self->{cursor} = 0;
1315 } elsif ($sym == CFClient::SDLK_END) { 1730 } elsif ($sym == CFClient::SDLK_END) {
1316 $self->{cursor} = length $text; 1731 $self->{cursor} = length $text;
1317 } elsif ($sym == 27) { 1732 } elsif ($uni == 27) {
1318 $self->emit ('escape'); 1733 $self->_emit ('escape');
1319 } elsif ($uni) { 1734 } elsif ($uni) {
1320 substr $text, $self->{cursor}++, 0, chr $uni; 1735 substr $text, $self->{cursor}++, 0, chr $uni;
1736 } else {
1737 return 0;
1321 } 1738 }
1322 1739
1323 $self->_set_text ($text); 1740 $self->_set_text ($text);
1324 $self->update; 1741
1742 $self->realloc;
1743
1744 1
1325} 1745}
1326 1746
1327sub focus_in { 1747sub focus_in {
1328 my ($self) = @_; 1748 my ($self) = @_;
1329 1749
… …
1344 utf8::encode $text; 1764 utf8::encode $text;
1345 $self->{cursor} = length substr $text, 0, $idx; 1765 $self->{cursor} = length substr $text, 0, $idx;
1346 1766
1347 $self->_set_text ($self->{text}); 1767 $self->_set_text ($self->{text});
1348 $self->update; 1768 $self->update;
1769
1770 1
1349} 1771}
1350 1772
1351sub mouse_motion { 1773sub mouse_motion {
1352 my ($self, $ev, $x, $y) = @_; 1774 my ($self, $ev, $x, $y) = @_;
1353# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1775# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1776
1777 0
1354} 1778}
1355 1779
1356sub _draw { 1780sub _draw {
1357 my ($self) = @_; 1781 my ($self) = @_;
1358 1782
… …
1405 my ($self, $ev) = @_; 1829 my ($self, $ev) = @_;
1406 1830
1407 my $sym = $ev->{sym}; 1831 my $sym = $ev->{sym};
1408 1832
1409 if ($sym == 13) { 1833 if ($sym == 13) {
1834 unshift @{$self->{history}},
1835 my $txt = $self->get_text;
1836 $self->{history_pointer} = -1;
1837 $self->{history_saveback} = '';
1410 $self->emit (activate => $self->get_text); 1838 $self->_emit (activate => $txt);
1411 $self->update; 1839 $self->update;
1412 1840
1841 } elsif ($sym == CFClient::SDLK_UP) {
1842 if ($self->{history_pointer} < 0) {
1843 $self->{history_saveback} = $self->get_text;
1844 }
1845 if (@{$self->{history} || []} > 0) {
1846 $self->{history_pointer}++;
1847 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1848 $self->{history_pointer} = @{$self->{history} || []} - 1;
1849 }
1850 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1851 }
1852
1853 } elsif ($sym == CFClient::SDLK_DOWN) {
1854 $self->{history_pointer}--;
1855 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1856
1857 if ($self->{history_pointer} >= 0) {
1858 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1859 } else {
1860 $self->set_text ($self->{history_saveback});
1861 }
1862
1413 } else { 1863 } else {
1414 $self->SUPER::key_down ($ev); 1864 return $self->SUPER::key_down ($ev)
1865 }
1866
1415 } 1867 1
1416
1417} 1868}
1418 1869
1419############################################################################# 1870#############################################################################
1420 1871
1421package CFClient::UI::Button; 1872package CFClient::UI::Button;
… …
1430 1881
1431sub new { 1882sub new {
1432 my $class = shift; 1883 my $class = shift;
1433 1884
1434 $class->SUPER::new ( 1885 $class->SUPER::new (
1435 padding => 4, 1886 padding_x => 4,
1887 padding_y => 4,
1436 fg => [1, 1, 1], 1888 fg => [1, 1, 1],
1437 bg => [1, 1, 1, 0.2],
1438 active_fg => [0, 0, 1], 1889 active_fg => [0, 0, 1],
1439 can_hover => 1, 1890 can_hover => 1,
1440 align => 0, 1891 align => 0,
1441 valign => 0, 1892 valign => 0,
1442 can_events => 1, 1893 can_events => 1,
1443 @_ 1894 @_
1444 ) 1895 )
1445} 1896}
1446 1897
1898sub activate { }
1899
1447sub button_up { 1900sub button_up {
1448 my ($self, $ev, $x, $y) = @_; 1901 my ($self, $ev, $x, $y) = @_;
1449 1902
1903 $self->emit ("activate")
1450 if ($x >= 0 && $x < $self->{w} 1904 if $x >= 0 && $x < $self->{w}
1451 && $y >= 0 && $y < $self->{h}) { 1905 && $y >= 0 && $y < $self->{h};
1452 $self->emit ("activate"); 1906
1453 } 1907 1
1454} 1908}
1455 1909
1456sub _draw { 1910sub _draw {
1457 my ($self) = @_; 1911 my ($self) = @_;
1458 1912
… …
1460 1914
1461 if ($GRAB == $self) { 1915 if ($GRAB == $self) {
1462 $self->{fg} = $self->{active_fg}; 1916 $self->{fg} = $self->{active_fg};
1463 } 1917 }
1464 1918
1465 glEnable GL_BLEND;
1466 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1467 glEnable GL_TEXTURE_2D; 1919 glEnable GL_TEXTURE_2D;
1468 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1920 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1469 glColor 0, 0, 0, 1; 1921 glColor 0, 0, 0, 1;
1470 1922
1471 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1923 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1472 1924
1473 glDisable GL_TEXTURE_2D; 1925 glDisable GL_TEXTURE_2D;
1474 glDisable GL_BLEND;
1475 1926
1476 $self->SUPER::_draw; 1927 $self->SUPER::_draw;
1477} 1928}
1478 1929
1479############################################################################# 1930#############################################################################
… …
1490 1941
1491sub new { 1942sub new {
1492 my $class = shift; 1943 my $class = shift;
1493 1944
1494 $class->SUPER::new ( 1945 $class->SUPER::new (
1495 padding => 2, 1946 padding_x => 2,
1947 padding_y => 2,
1496 fg => [1, 1, 1], 1948 fg => [1, 1, 1],
1497 active_fg => [1, 1, 0], 1949 active_fg => [1, 1, 0],
1950 bg => [0, 0, 0, 0.2],
1951 active_bg => [1, 1, 1, 0.5],
1498 state => 0, 1952 state => 0,
1499 can_hover => 1, 1953 can_hover => 1,
1500 @_ 1954 @_
1501 ) 1955 )
1502} 1956}
1503 1957
1504sub size_request { 1958sub size_request {
1505 my ($self) = @_; 1959 my ($self) = @_;
1506 1960
1507 ($self->{padding} * 2 + 6) x 2 1961 (6) x 2
1508} 1962}
1509 1963
1510sub button_down { 1964sub button_down {
1511 my ($self, $ev, $x, $y) = @_; 1965 my ($self, $ev, $x, $y) = @_;
1512 1966
1513 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1967 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1514 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1968 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1515 $self->{state} = !$self->{state}; 1969 $self->{state} = !$self->{state};
1516 $self->emit (changed => $self->{state}); 1970 $self->_emit (changed => $self->{state});
1971 } else {
1972 return 0
1973 }
1974
1517 } 1975 1
1518} 1976}
1519 1977
1520sub _draw { 1978sub _draw {
1521 my ($self) = @_; 1979 my ($self) = @_;
1522 1980
1523 $self->SUPER::_draw; 1981 $self->SUPER::_draw;
1524 1982
1525 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1983 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1526 1984
1527 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1985 my ($w, $h) = @$self{qw(w h)};
1986
1987 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1528 1988
1529 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1989 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1530 1990
1531 glEnable GL_BLEND; 1991 my $tex = $self->{state} ? $tex[1] : $tex[0];
1992
1532 glEnable GL_TEXTURE_2D; 1993 glEnable GL_TEXTURE_2D;
1533 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1534
1535 my $tex = $self->{state} ? $tex[1] : $tex[0];
1536
1537 $tex->draw_quad (0, 0, $s, $s); 1994 $tex->draw_quad_alpha (0, 0, $s, $s);
1538
1539 glDisable GL_TEXTURE_2D; 1995 glDisable GL_TEXTURE_2D;
1540 glDisable GL_BLEND;
1541} 1996}
1542 1997
1543############################################################################# 1998#############################################################################
1544 1999
1545package CFClient::UI::Image; 2000package CFClient::UI::Image;
… …
1588 glTranslate 0, -$self->{w}, 0; 2043 glTranslate 0, -$self->{w}, 0;
1589 2044
1590 ($w, $h) = ($h, $w); 2045 ($w, $h) = ($h, $w);
1591 } 2046 }
1592 2047
1593 glEnable GL_BLEND;
1594 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1595 glEnable GL_TEXTURE_2D; 2048 glEnable GL_TEXTURE_2D;
1596 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2049 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1597 2050
1598 $tex->draw_quad (0, 0, $w, $h); 2051 $tex->draw_quad_alpha (0, 0, $w, $h);
1599 2052
1600 glDisable GL_BLEND;
1601 glDisable GL_TEXTURE_2D; 2053 glDisable GL_TEXTURE_2D;
1602} 2054}
1603 2055
1604############################################################################# 2056#############################################################################
1605 2057
1606package CFClient::UI::VGauge; 2058package CFClient::UI::VGauge;
1607 2059
1608our @ISA = CFClient::UI::Base::; 2060our @ISA = CFClient::UI::Base::;
2061
2062use List::Util qw(min max);
1609 2063
1610use CFClient::OpenGL; 2064use CFClient::OpenGL;
1611 2065
1612my %tex = ( 2066my %tex = (
1613 food => [ 2067 food => [
1614 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2068 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1615 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2069 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1616 ], 2070 ],
1617 grace => [ 2071 grace => [
1618 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1619 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ 2073 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1620 ], 2074 ],
1621 hp => [ 2075 hp => [
1622 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2076 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1623 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2077 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1624 ], 2078 ],
1625 mana => [ 2079 mana => [
1626 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2080 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1627 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ 2081 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1628 ], 2082 ],
1629); 2083);
1630 2084
1631# eg. VGauge->new (gauge => 'food'), default gauge: food 2085# eg. VGauge->new (gauge => 'food'), default gauge: food
1632sub new { 2086sub new {
… …
1651} 2105}
1652 2106
1653sub set_max { 2107sub set_max {
1654 my ($self, $max) = @_; 2108 my ($self, $max) = @_;
1655 2109
2110 return if $self->{max_val} == $max;
2111
1656 $self->{max_val} = $max; 2112 $self->{max_val} = $max;
2113 $self->update;
1657} 2114}
1658 2115
1659sub set_value { 2116sub set_value {
1660 my ($self, $val, $max) = @_; 2117 my ($self, $val, $max) = @_;
1661 2118
1662 $self->set_max ($max) 2119 $self->set_max ($max)
1663 if defined $max; 2120 if defined $max;
1664 2121
1665 $max = $self->{max_val}; 2122 return if $self->{val} == $val;
2123
1666 $self->{val} = $val; 2124 $self->{val} = $val;
1667
1668 $self->update; 2125 $self->update;
1669} 2126}
1670 2127
1671sub _draw { 2128sub _draw {
1672 my ($self) = @_; 2129 my ($self) = @_;
1673 2130
1674 my $tex = $tex{$self->{type}}; 2131 my $tex = $tex{$self->{type}};
2132 my ($t1, $t2, $t3) = @$tex;
1675 2133
1676 my ($w, $h) = ($self->{w}, $self->{h}); 2134 my ($w, $h) = ($self->{w}, $self->{h});
1677 2135
1678 if ($self->{vertical}) { 2136 if ($self->{vertical}) {
1679 glRotate 90, 0, 0, 1; 2137 glRotate 90, 0, 0, 1;
… …
1681 2139
1682 ($w, $h) = ($h, $w); 2140 ($w, $h) = ($h, $w);
1683 } 2141 }
1684 2142
1685 my $ycut = $self->{val} / ($self->{max_val} || 1); 2143 my $ycut = $self->{val} / ($self->{max_val} || 1);
1686 $ycut = 1 if $self->{val} > $self->{max_val};
1687 2144
1688 my $t1 = $tex->[0]; 2145 my $ycut1 = max 0, min 1, $ycut;
1689 my $t2 = $tex->[1]; 2146 my $ycut2 = max 0, min 1, $ycut - 1;
2147
2148 my $h1 = $self->{h} * (1 - $ycut1);
2149 my $h2 = $self->{h} * (1 - $ycut2);
1690 2150
1691 glEnable GL_BLEND; 2151 glEnable GL_BLEND;
1692 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2152 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1693 glEnable GL_TEXTURE_2D; 2153 glEnable GL_TEXTURE_2D;
1694 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2154 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1695 2155
1696 my $h1 = $self->{h} - $ycut * $self->{h};
1697 my $h2 = $ycut * $self->{h};
1698
1699 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2156 glBindTexture GL_TEXTURE_2D, $t1->{name};
1700 glBegin GL_QUADS; 2157 glBegin GL_QUADS;
1701 glTexCoord 0 , 0; glVertex 0 , 0; 2158 glTexCoord 0 , 0; glVertex 0 , 0;
1702 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 2159 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1703 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 2160 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1704 glTexCoord $t1->{s}, 0; glVertex $w, 0; 2161 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1705 glEnd; 2162 glEnd;
1706 2163
2164 my $ycut1 = List::Util::min 1, $ycut;
1707 glBindTexture GL_TEXTURE_2D, $t2->{name}; 2165 glBindTexture GL_TEXTURE_2D, $t2->{name};
1708 glBegin GL_QUADS; 2166 glBegin GL_QUADS;
1709 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 2167 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1710 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 2168 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1711 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 2169 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1712 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 2170 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1713 glEnd; 2171 glEnd;
2172
2173 if ($t3) {
2174 glBindTexture GL_TEXTURE_2D, $t3->{name};
2175 glBegin GL_QUADS;
2176 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2177 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
2178 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
2179 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2180 glEnd;
2181 }
1714 2182
1715 glDisable GL_BLEND; 2183 glDisable GL_BLEND;
1716 glDisable GL_TEXTURE_2D; 2184 glDisable GL_TEXTURE_2D;
1717} 2185}
1718 2186
… …
1724 2192
1725sub new { 2193sub new {
1726 my ($class, %arg) = @_; 2194 my ($class, %arg) = @_;
1727 2195
1728 my $self = $class->SUPER::new ( 2196 my $self = $class->SUPER::new (
1729 tooltip => $arg{type}, 2197 tooltip => $arg{type},
2198 can_hover => 1,
2199 can_events => 1,
1730 %arg, 2200 %arg,
1731 ); 2201 );
1732 2202
1733 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2203 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1734 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1); 2204 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1735 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2205 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1736 2206
1737 $self 2207 $self
1738} 2208}
1739 2209
… …
1742 2212
1743 $self->{value}->set_fontsize ($fsize); 2213 $self->{value}->set_fontsize ($fsize);
1744 $self->{max} ->set_fontsize ($fsize); 2214 $self->{max} ->set_fontsize ($fsize);
1745} 2215}
1746 2216
2217sub set_max {
2218 my ($self, $max) = @_;
2219
2220 $self->{gauge}->set_max ($max);
2221 $self->{max}->set_text ($max);
2222}
2223
1747sub set_value { 2224sub set_value {
1748 my ($self, $val, $max) = @_; 2225 my ($self, $val, $max) = @_;
1749 2226
1750 $self->set_max ($max) 2227 $self->set_max ($max)
1751 if defined $max; 2228 if defined $max;
1752 2229
1753 $self->{gauge}->set_value ($val, $max); 2230 $self->{gauge}->set_value ($val, $max);
1754 $self->{value}->set_text ($val); 2231 $self->{value}->set_text ($val);
1755}
1756
1757sub set_max {
1758 my ($self, $max) = @_;
1759
1760 $self->{gauge}->set_max ($max);
1761 $self->{max}->set_text ($max);
1762} 2232}
1763 2233
1764############################################################################# 2234#############################################################################
1765 2235
1766package CFClient::UI::Slider; 2236package CFClient::UI::Slider;
… …
1776 qw(s1_slider.png s1_slider_bg.png); 2246 qw(s1_slider.png s1_slider_bg.png);
1777 2247
1778sub new { 2248sub new {
1779 my $class = shift; 2249 my $class = shift;
1780 2250
1781 # range [value, low, high, page] 2251 # range [value, low, high, page, unit]
1782 2252
1783 # TODO: 0-width page 2253 # TODO: 0-width page
1784 # TODO: req_w/h are wrong with vertical 2254 # TODO: req_w/h are wrong with vertical
1785 # TODO: calculations are off 2255 # TODO: calculations are off
1786 my $self = $class->SUPER::new ( 2256 my $self = $class->SUPER::new (
1787 fg => [1, 1, 1], 2257 fg => [1, 1, 1],
1788 active_fg => [0, 0, 0], 2258 active_fg => [0, 0, 0],
2259 bg => [0, 0, 0, 0.2],
2260 active_bg => [1, 1, 1, 0.5],
1789 range => [0, 0, 100, 10], 2261 range => [0, 0, 100, 10, 0],
1790 req_w => 20, 2262 min_w => $::WIDTH / 80,
1791 req_h => 20, 2263 min_h => $::WIDTH / 80,
1792 vertical => 0, 2264 vertical => 0,
1793 can_hover => 1, 2265 can_hover => 1,
1794 inner_pad => 5, 2266 inner_pad => 0.02,
1795 @_ 2267 @_
1796 ); 2268 );
1797 2269
2270 $self->set_value ($self->{range}[0]);
2271 $self->update;
2272
1798 $self 2273 $self
1799} 2274}
1800 2275
2276sub changed { }
2277
2278sub set_range {
2279 my ($self, $range) = @_;
2280
2281 ($range, $self->{range}) = ($self->{range}, $range);
2282
2283 $self->update
2284 if "@$range" ne "@{$self->{range}}";
2285}
2286
2287sub set_value {
2288 my ($self, $value) = @_;
2289
2290 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2291
2292 $hi = $lo + 1 if $hi <= $lo;
2293
2294 $page = $hi - $lo if $page > $hi - $lo;
2295
2296 $value = $lo if $value < $lo;
2297 $value = $hi - $page if $value > $hi - $page;
2298
2299 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2300 if $unit;
2301
2302 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2303
2304 if ($value != $old_value) {
2305 $self->_emit (changed => $value);
2306 $self->update;
2307 }
2308}
2309
1801sub size_request { 2310sub size_request {
1802 my ($self) = @_; 2311 my ($self) = @_;
1803 2312
1804 my $w = $self->{req_w}; 2313 ($self->{req_w}, $self->{req_h})
1805 my $h = $self->{req_h};
1806
1807 $self->{vertical} ? ($h, $w) : ($w, $h)
1808} 2314}
1809 2315
1810sub button_down { 2316sub button_down {
1811 my ($self, $ev, $x, $y) = @_; 2317 my ($self, $ev, $x, $y) = @_;
1812 2318
1813 $self->SUPER::button_down ($ev, $x, $y); 2319 $self->SUPER::button_down ($ev, $x, $y);
2320
2321 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2322
1814 $self->mouse_motion ($ev, $x, $y); 2323 $self->mouse_motion ($ev, $x, $y)
1815} 2324}
1816 2325
1817sub mouse_motion { 2326sub mouse_motion {
1818 my ($self, $ev, $x, $y) = @_; 2327 my ($self, $ev, $x, $y) = @_;
1819 2328
1820 if ($GRAB == $self) { 2329 if ($GRAB == $self) {
2330 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2331
2332 my (undef, $lo, $hi, $page) = @{$self->{range}};
2333
2334 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2335
2336 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2337 } else {
2338 return 0;
2339 }
2340
2341 1
2342}
2343
2344sub update {
2345 my ($self) = @_;
2346
2347 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2348 $self->set_value ($self->{range}[0]);
2349
1821 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2350 my ($value, $lo, $hi, $page) = @{$self->{range}};
2351 my $range = ($hi - $page - $lo) || 1e-100;
1822 2352
1823 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2353 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1824 2354
1825 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2355 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1826 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2356 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1827 2357
1828 $x -= $inner_pad_px; # substract the padding 2358 $value = ($value - $lo) / $range;
1829 $x = $x * ($hi - $lo) / $inner_w + $lo; 2359 $value = $value * $self->{scale} + $self->{offset};
1830 $x = $lo if $x < $lo;
1831 $x = $hi - $page if $x > $hi - $page;
1832 $self->{range}[0] = $x;
1833 2360
1834 $self->emit (changed => $x); 2361 $self->{knob_x} = $value - $knob_w * 0.5;
1835 $self->update; 2362 $self->{knob_w} = $knob_w;
1836 } 2363 });
1837}
1838 2364
1839# the inner_* stuff is for generating a padding for the slider handle, 2365 $self->SUPER::update;
1840# so that the handle doesn't leave the texture. This calculation isn't 100%
1841# correct propably, but it does the job for now
1842sub _calc_inner_pad_px {
1843 my ($self, $w) = @_;
1844 ($w / 100) * $self->{inner_pad} # % to pixels
1845} 2366}
1846 2367
1847sub _draw { 2368sub _draw {
1848 my ($self) = @_; 2369 my ($self) = @_;
1849 2370
1850 $self->SUPER::_draw (); 2371 $self->SUPER::_draw ();
1851 2372
1852 my ($w, $h) = @$self{qw(w h)}; 2373 glScale $self->{w}, $self->{h};
1853 2374
1854 if ($self->{vertical}) { 2375 if ($self->{vertical}) {
1855 # draw a vertical slider like a rotated horizontal slider 2376 # draw a vertical slider like a rotated horizontal slider
1856 2377
2378 glTranslate 1, 0, 0;
1857 glRotate 90, 0, 0, 1; 2379 glRotate 90, 0, 0, 1;
1858 glTranslate 0, -$self->{w}, 0;
1859
1860 ($w, $h) = ($h, $w);
1861 } 2380 }
1862 2381
1863 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2382 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1864 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2383 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1865 2384
1866 my ($value, $lo, $hi, $page) = @{$self->{range}};
1867
1868 $hi = $value + 1 if $lo == $hi;
1869
1870 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1871 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1872
1873 $page = int $page * $inner_w / ($hi - $lo);
1874 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1875
1876 $w -= $page;
1877 $page &= ~1;
1878 glTranslate $page * 0.5, 0, 0;
1879 $page ||= 2;
1880
1881 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1882 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1883
1884 glEnable GL_BLEND;
1885 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1886 glEnable GL_TEXTURE_2D; 2385 glEnable GL_TEXTURE_2D;
1887 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2386 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1888 2387
1889 # draw background 2388 # draw background
1890 $tex[1]->draw_quad (0, 0, $w, $h); 2389 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1891 2390
1892 # draw handle 2391 # draw handle
1893 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2392 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
1894 2393
1895 glDisable GL_BLEND;
1896 glDisable GL_TEXTURE_2D; 2394 glDisable GL_TEXTURE_2D;
1897} 2395}
2396
2397#############################################################################
2398
2399package CFClient::UI::ValSlider;
2400
2401our @ISA = CFClient::UI::HBox::;
2402
2403sub new {
2404 my ($class, %arg) = @_;
2405
2406 my $range = delete $arg{range};
2407
2408 my $self = $class->SUPER::new (
2409 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2410 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2411 to_value => sub { shift },
2412 from_value => sub { shift },
2413 %arg,
2414 );
2415
2416 $self->{slider}->connect (changed => sub {
2417 my ($self, $value) = @_;
2418 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2419 $self->{parent}->emit (changed => $value);
2420 });
2421
2422# $self->{entry}->connect (changed => sub {
2423# my ($self, $value) = @_;
2424# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2425# $self->{parent}->emit (changed => $value);
2426# });
2427
2428 $self->add ($self->{slider}, $self->{entry});
2429
2430 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2431
2432 $self
2433}
2434
2435sub set_range { shift->{slider}->set_range (@_) }
2436sub set_value { shift->{slider}->set_value (@_) }
1898 2437
1899############################################################################# 2438#############################################################################
1900 2439
1901package CFClient::UI::TextView; 2440package CFClient::UI::TextView;
1902 2441
… …
1906 2445
1907sub new { 2446sub new {
1908 my $class = shift; 2447 my $class = shift;
1909 2448
1910 my $self = $class->SUPER::new ( 2449 my $self = $class->SUPER::new (
1911 fontsize => 1, 2450 fontsize => 1,
2451 can_events => 0,
2452 #font => default_font
1912 @_, 2453 @_,
1913 2454
1914 layout => (new CFClient::Layout), 2455 layout => (new CFClient::Layout 1),
1915 par => [], 2456 par => [],
1916 height => 0, 2457 height => 0,
1917 children => [ 2458 children => [
1918 (new CFClient::UI::Empty expand => 1), 2459 (new CFClient::UI::Empty expand => 1),
1919 (new CFClient::UI::Slider vertical => 1), 2460 (new CFClient::UI::Slider vertical => 1),
1920 ], 2461 ],
1921 ); 2462 );
1922 2463
1923 $self->{children}[1]->connect (changed => sub { 2464 $self->{children}[1]->connect (changed => sub { $self->update });
1924 $self->update;
1925 });
1926 2465
1927 $self 2466 $self
1928} 2467}
1929 2468
1930sub set_fontsize { 2469sub set_fontsize {
… …
1932 2471
1933 $self->{fontsize} = $fontsize; 2472 $self->{fontsize} = $fontsize;
1934 $self->reflow; 2473 $self->reflow;
1935} 2474}
1936 2475
2476sub size_allocate {
2477 my ($self, $w, $h) = @_;
2478
2479 $self->SUPER::size_allocate ($w, $h);
2480
2481 $self->{layout}->set_font ($self->{font}) if $self->{font};
2482 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2483 $self->{layout}->set_width ($self->{children}[0]{w});
2484
2485 $self->reflow;
2486}
2487
1937sub text_height { 2488sub text_size {
1938 my ($self, $text) = @_; 2489 my ($self, $text, $indent) = @_;
1939 2490
1940 my $layout = $self->{layout}; 2491 my $layout = $self->{layout};
1941 2492
1942 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2493 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1943 $layout->set_width ($self->{w}); 2494 $layout->set_width ($self->{children}[0]{w} - $indent);
1944 $layout->set_text ($text); 2495 $layout->set_markup ($text);
1945 2496
1946 ($layout->size)[1] 2497 $layout->size
1947} 2498}
1948 2499
1949sub reflow { 2500sub reflow {
1950 my ($self) = @_; 2501 my ($self) = @_;
1951 2502
1952 $self->{need_reflow}++; 2503 $self->{need_reflow}++;
1953 $self->update; 2504 $self->update;
1954} 2505}
1955 2506
1956sub size_allocate { 2507sub set_offset {
2508 my ($self, $offset) = @_;
2509
2510 # todo: base offset on lines or so, not on pixels
2511 $self->{children}[1]->set_value ($offset);
2512}
2513
2514sub clear {
1957 my ($self, $w, $h) = @_; 2515 my ($self) = @_;
1958 2516
1959 $self->SUPER::size_allocate ($w, $h); 2517 $self->{par} = [];
1960 2518 $self->{height} = 0;
1961 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2519 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
1962 $self->{layout}->set_width ($self->{children}[0]{w});
1963
1964 $self->reflow;
1965} 2520}
1966 2521
1967sub add_paragraph { 2522sub add_paragraph {
1968 my ($self, $color, $text) = @_; 2523 my ($self, $color, $text, $indent) = @_;
1969 2524
1970 #TODO: intelligently "reformat" paragraph 2525 for my $line (split /\n/, $text) {
1971 2526 my ($w, $h) = $self->text_size ($line);
1972 my $height = $self->text_height ($text);
1973
1974 $self->{height} += $height; 2527 $self->{height} += $h;
2528 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2529 }
1975 2530
1976 push @{$self->{par}}, [$height, $color, $text];
1977
1978 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2531 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
1979 $self->{children}[1]->update;
1980} 2532}
1981 2533
1982sub update { 2534sub update {
1983 my ($self) = @_; 2535 my ($self) = @_;
1984 2536
… …
1986 2538
1987 return unless $self->{h} > 0; 2539 return unless $self->{h} > 0;
1988 2540
1989 delete $self->{texture}; 2541 delete $self->{texture};
1990 2542
1991 $ROOT->on_refresh ($self, sub { 2543 $ROOT->on_post_alloc ($self, sub {
2544 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2545
1992 if (delete $self->{need_reflow}) { 2546 if (delete $self->{need_reflow}) {
1993 my $height = 0; 2547 my $height = 0;
1994 2548
1995 $height += $_->[0] = $self->text_height ($_->[2]) 2549 my $layout = $self->{layout};
2550
2551 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2552
1996 for @{$self->{par}}; 2553 for (@{$self->{par}}) {
2554 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2555 $layout->set_width ($W - $_->[3]);
2556 $layout->set_markup ($_->[4]);
2557 my ($w, $h) = $layout->size;
2558 $_->[0] = $w + $_->[3];
2559 $_->[1] = $h;
2560 }
2561
2562 $height += $_->[1];
2563 }
1997 2564
1998 $self->{height} = $height; 2565 $self->{height} = $height;
1999 2566
2000 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2567 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2001 2568
2002 delete $self->{texture}; 2569 delete $self->{texture};
2003 } 2570 }
2004 2571
2005 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2572 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2006 glClearColor 0, 0, 0, 1; 2573 glClearColor 0.5, 0.5, 0.5, 0;
2007 glClear GL_COLOR_BUFFER_BIT; 2574 glClear GL_COLOR_BUFFER_BIT;
2008 2575
2576 my $top = int $self->{children}[1]{range}[0];
2577
2578 my $y0 = $top;
2579 my $y1 = $top + $H;
2580
2581 my $y = 0;
2582
2583 my $layout = $self->{layout};
2584
2585 $layout->set_font ($self->{font}) if $self->{font};
2586
2009 glEnable GL_BLEND; 2587 glEnable GL_BLEND;
2588 #TODO# not correct in windows where rgba is forced off
2010 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2589 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2011 glEnable GL_TEXTURE_2D;
2012 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2013
2014 my $top = int $self->{children}[1]{range}[0];
2015
2016 my $y0 = $top;
2017 my $y1 = $top + $self->{h};
2018
2019 my $y = 0;
2020
2021 my $layout = $self->{layout};
2022 2590
2023 for my $par (@{$self->{par}}) { 2591 for my $par (@{$self->{par}}) {
2024 my $h = $par->[0]; 2592 my $h = $par->[1];
2025 2593
2026 if ($y0 < $y + $h && $y < $y1) { 2594 if ($y0 < $y + $h && $y < $y1) {
2595 $layout->set_foreground (@{ $par->[2] });
2596 $layout->set_width ($W - $par->[3]);
2027 $layout->set_text ($par->[2]); 2597 $layout->set_markup ($par->[4]);
2028 2598
2029 glColor @{ $par->[1] }; 2599 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2030 my ($W, $H) = $layout->size; 2600
2031 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2601 glRasterPos $par->[3], $y - $y0;
2602 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2032 } 2603 }
2033 2604
2034 $y += $h; 2605 $y += $h;
2035 } 2606 }
2036 2607
2037 glDisable GL_TEXTURE_2D;
2038 glDisable GL_BLEND; 2608 glDisable GL_BLEND;
2039 }; 2609 };
2040 }); 2610 });
2041} 2611}
2042 2612
2043sub _draw { 2613sub _draw {
2044 my ($self) = @_; 2614 my ($self) = @_;
2045 2615
2046 if ($self->{texture}) {
2047 glEnable GL_TEXTURE_2D; 2616 glEnable GL_TEXTURE_2D;
2048 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2617 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2618 glColor 1, 1, 1, 1;
2049 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2619 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2050 glDisable GL_TEXTURE_2D; 2620 glDisable GL_TEXTURE_2D;
2051 }
2052 2621
2053 $self->{children}[1]->draw; 2622 $self->{children}[1]->draw;
2054 2623
2055} 2624}
2056 2625
… …
2104 2673
2105sub new { 2674sub new {
2106 my $class = shift; 2675 my $class = shift;
2107 2676
2108 my $self = $class->SUPER::new ( 2677 my $self = $class->SUPER::new (
2109 state => 0, 2678 state => 0,
2110 connect_activate => \&toggle_flopper, 2679 on_activate => \&toggle_flopper,
2111 can_events => 1,
2112 @_ 2680 @_
2113 ); 2681 );
2114 2682
2115 if ($self->{state}) {
2116 $self->{state} = 0;
2117 $self->toggle_flopper;
2118 }
2119
2120 $self 2683 $self
2121} 2684}
2122 2685
2123sub toggle_flopper { 2686sub toggle_flopper {
2124 my ($self) = @_; 2687 my ($self) = @_;
2125 2688
2126 # TODO: use animation 2689 $self->{other}->toggle_visibility;
2127 if ($self->{state} = !$self->{state}) {
2128 $CFClient::UI::ROOT->add ($self->{other});
2129 $self->{other}->move ($self->coord2global (0, $self->{h}));
2130 $self->emit ("open");
2131 } else {
2132 $CFClient::UI::ROOT->remove ($self->{other});
2133 $self->emit ("close");
2134 }
2135
2136 $self->emit (changed => $self->{state});
2137} 2690}
2138 2691
2139############################################################################# 2692#############################################################################
2140 2693
2141package CFClient::UI::Tooltip; 2694package CFClient::UI::Tooltip;
… …
2151 @_, 2704 @_,
2152 can_events => 0, 2705 can_events => 0,
2153 ) 2706 )
2154} 2707}
2155 2708
2156sub set_text { 2709sub set_tooltip_from {
2157 my ($self, $text) = @_; 2710 my ($self, $widget) = @_;
2158 2711
2159 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2712 my $tooltip = $widget->{tooltip};
2160 $self->{label}->set_text ($text); 2713
2161 $self->add ($self->{label}); 2714 if ($ENV{CFPLUS_DEBUG} & 2) {
2715 $tooltip .= "\n\n" . (ref $widget) . "\n"
2716 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2717 . "req $widget->{req_w} $widget->{req_h}\n"
2718 . "visible $widget->{visible}";
2719 }
2720
2721 $self->add (new CFClient::UI::Label
2722 markup => $tooltip,
2723 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2724 fontsize => 0.8,
2725 fg => [0, 0, 0, 1],
2726 ellipsise => 0,
2727 font => ($widget->{tooltip_font} || $::FONT_PROP),
2728 );
2162} 2729}
2163 2730
2164sub size_request { 2731sub size_request {
2165 my ($self) = @_; 2732 my ($self) = @_;
2166 2733
2167 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2734 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2168 2735
2169 $w = List::Util::min $::WIDTH * 0.2, $w;
2170 $h = List::Util::max $::HEIGHT * 0.2, $h;
2171
2172 ($w + 4, $h + 4) 2736 ($w + 4, $h + 4)
2173} 2737}
2174 2738
2739sub size_allocate {
2740 my ($self, $w, $h) = @_;
2741
2742 $self->SUPER::size_allocate ($w - 4, $h - 4);
2743}
2744
2745sub visibility_change {
2746 my ($self, $visible) = @_;
2747
2748 return unless $visible;
2749
2750 $self->{root}->on_post_alloc ("move_$self" => sub {
2751 my $widget = $self->{owner}
2752 or return;
2753
2754 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2755
2756 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2757 if $x + $self->{w} > $::WIDTH;
2758
2759 $self->move_abs ($x, $y);
2760 });
2761}
2762
2175sub _draw { 2763sub _draw {
2176 my ($self) = @_; 2764 my ($self) = @_;
2177 2765
2178 glPushMatrix;
2179 glTranslate 0.375, 0.375; 2766 glTranslate 0.375, 0.375;
2180 2767
2181 my ($w, $h) = @$self{qw(w h)}; 2768 my ($w, $h) = @$self{qw(w h)};
2182 2769
2183 glColor 1, 0.8, 0.4; 2770 glColor 1, 0.8, 0.4;
… …
2194 glVertex 0 , $h; 2781 glVertex 0 , $h;
2195 glVertex $w, $h; 2782 glVertex $w, $h;
2196 glVertex $w, 0; 2783 glVertex $w, 0;
2197 glEnd; 2784 glEnd;
2198 2785
2199 glPopMatrix; 2786 glTranslate 2 - 0.375, 2 - 0.375;
2200 2787
2201 glTranslate 2, 2;
2202 $self->SUPER::_draw; 2788 $self->SUPER::_draw;
2203} 2789}
2204 2790
2205############################################################################# 2791#############################################################################
2206 2792
2793package CFClient::UI::Face;
2794
2795our @ISA = CFClient::UI::Base::;
2796
2797use CFClient::OpenGL;
2798
2799sub new {
2800 my $class = shift;
2801
2802 my $self = $class->SUPER::new (
2803 aspect => 1,
2804 can_events => 0,
2805 @_,
2806 );
2807
2808 if ($self->{anim} && $self->{animspeed}) {
2809 Scalar::Util::weaken (my $widget = $self);
2810
2811 $self->{timer} = Event->timer (
2812 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2813 hard => 1,
2814 interval => $self->{animspeed},
2815 cb => sub {
2816 ++$widget->{frame};
2817 $widget->update;
2818 },
2819 );
2820 }
2821
2822 $self
2823}
2824
2825sub size_request {
2826 (32, 8)
2827}
2828
2829sub update {
2830 my ($self) = @_;
2831
2832 return unless $self->{visible};
2833
2834 $self->SUPER::update;
2835}
2836
2837sub _draw {
2838 my ($self) = @_;
2839
2840 return unless $::CONN;
2841
2842 my $face;
2843
2844 if ($self->{frame}) {
2845 my $anim = $::CONN->{anim}[$self->{anim}];
2846
2847 $face = $anim->[ $self->{frame} % @$anim ]
2848 if $anim && @$anim;
2849 }
2850
2851 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2852
2853 if ($tex) {
2854 glEnable GL_TEXTURE_2D;
2855 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2856 glColor 1, 1, 1, 1;
2857 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2858 glDisable GL_TEXTURE_2D;
2859 }
2860}
2861
2862sub DESTROY {
2863 my ($self) = @_;
2864
2865 $self->{timer}->cancel
2866 if $self->{timer};
2867
2868 $self->SUPER::DESTROY;
2869}
2870
2871#############################################################################
2872
2873package CFClient::UI::Buttonbar;
2874
2875our @ISA = CFClient::UI::HBox::;
2876
2877# TODO: should actualyl wrap buttons and other goodies.
2878
2879#############################################################################
2880
2881package CFClient::UI::Menu;
2882
2883our @ISA = CFClient::UI::FancyFrame::;
2884
2885use CFClient::OpenGL;
2886
2887sub new {
2888 my $class = shift;
2889
2890 my $self = $class->SUPER::new (
2891 items => [],
2892 z => 100,
2893 @_,
2894 );
2895
2896 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2897
2898 for my $item (@{ $self->{items} }) {
2899 my ($widget, $cb) = @$item;
2900
2901 # handle various types of items, only text for now
2902 if (!ref $widget) {
2903 $widget = new CFClient::UI::Label
2904 can_hover => 1,
2905 can_events => 1,
2906 text => $widget;
2907 }
2908
2909 $self->{item}{$widget} = $item;
2910
2911 $self->{vbox}->add ($widget);
2912 }
2913
2914 $self
2915}
2916
2917# popup given the event (must be a mouse button down event currently)
2918sub popup {
2919 my ($self, $ev) = @_;
2920
2921 $self->_emit ("popdown");
2922
2923 # maybe save $GRAB? must be careful about events...
2924 $GRAB = $self;
2925 $self->{button} = $ev->{button};
2926
2927 $self->show;
2928 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2929}
2930
2931sub mouse_motion {
2932 my ($self, $ev, $x, $y) = @_;
2933
2934 # TODO: should use vbox->find_widget or so
2935 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2936 $self->{hover} = $self->{item}{$HOVER};
2937
2938 0
2939}
2940
2941sub button_up {
2942 my ($self, $ev, $x, $y) = @_;
2943
2944 if ($ev->{button} == $self->{button}) {
2945 undef $GRAB;
2946 $self->hide;
2947
2948 $self->_emit ("popdown");
2949 $self->{hover}[1]->() if $self->{hover};
2950 } else {
2951 return 0
2952 }
2953
2954 1
2955}
2956
2957#############################################################################
2958
2959package CFClient::UI::Multiplexer;
2960
2961our @ISA = CFClient::UI::Container::;
2962
2963sub new {
2964 my $class = shift;
2965
2966 my $self = $class->SUPER::new (
2967 @_,
2968 );
2969
2970 $self->{current} = $self->{children}[0]
2971 if @{ $self->{children} };
2972
2973 $self
2974}
2975
2976sub add {
2977 my ($self, @widgets) = @_;
2978
2979 $self->SUPER::add (@widgets);
2980
2981 $self->{current} = $self->{children}[0]
2982 if @{ $self->{children} };
2983}
2984
2985sub set_current_page {
2986 my ($self, $page_or_widget) = @_;
2987
2988 my $widget = ref $page_or_widget
2989 ? $page_or_widget
2990 : $self->{children}[$page_or_widget];
2991
2992 $self->{current} = $widget;
2993 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2994
2995 $self->_emit (page_changed => $self->{current});
2996
2997 $self->realloc;
2998}
2999
3000sub visible_children {
3001 $_[0]{current}
3002}
3003
3004sub size_request {
3005 my ($self) = @_;
3006
3007 $self->{current}->size_request
3008}
3009
3010sub size_allocate {
3011 my ($self, $w, $h) = @_;
3012
3013 $self->{current}->configure (0, 0, $w, $h);
3014}
3015
3016sub _draw {
3017 my ($self) = @_;
3018
3019 $self->{current}->draw;
3020}
3021
3022#############################################################################
3023
3024package CFClient::UI::Notebook;
3025
3026our @ISA = CFClient::UI::VBox::;
3027
3028sub new {
3029 my $class = shift;
3030
3031 my $self = $class->SUPER::new (
3032 buttonbar => (new CFClient::UI::Buttonbar),
3033 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3034 # filter => # will be put between multiplexer and $self
3035 @_,
3036 );
3037
3038 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3039 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3040
3041 $self
3042}
3043
3044sub add {
3045 my ($self, $title, $widget, $tooltip) = @_;
3046
3047 Scalar::Util::weaken $self;
3048
3049 $self->{buttonbar}->add (new CFClient::UI::Button
3050 markup => $title,
3051 tooltip => $tooltip,
3052 on_activate => sub { $self->set_current_page ($widget) },
3053 );
3054
3055 $self->{multiplexer}->add ($widget);
3056}
3057
3058sub set_current_page {
3059 my ($self, $page) = @_;
3060
3061 $self->{multiplexer}->set_current_page ($page);
3062 $self->_emit (page_changed => $self->{multiplexer}{current});
3063}
3064
3065#############################################################################
3066
3067package CFClient::UI::Statusbox;
3068
3069our @ISA = CFClient::UI::VBox::;
3070
3071sub new {
3072 my $class = shift;
3073
3074 $class->SUPER::new (
3075 fontsize => 0.8,
3076 @_,
3077 )
3078}
3079
3080sub reorder {
3081 my ($self) = @_;
3082 my $NOW = time;
3083
3084 while (my ($k, $v) = each %{ $self->{item} }) {
3085 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3086 }
3087
3088 my @widgets;
3089
3090 my @items = sort {
3091 $a->{pri} <=> $b->{pri}
3092 or $b->{id} <=> $a->{id}
3093 } values %{ $self->{item} };
3094
3095 my $count = 10 + 1;
3096 for my $item (@items) {
3097 last unless --$count;
3098
3099 push @widgets, $item->{label} ||= do {
3100 # TODO: doesn't handle markup well (read as: at all)
3101 my $short = $item->{count} > 1
3102 ? "<b>$item->{count} ×</b> $item->{text}"
3103 : $item->{text};
3104
3105 for ($short) {
3106 s/^\s+//;
3107 s/\s+/ /g;
3108 }
3109
3110 new CFClient::UI::Label
3111 markup => $short,
3112 tooltip => $item->{tooltip},
3113 tooltip_font => $::FONT_PROP,
3114 tooltip_width => 0.67,
3115 fontsize => $item->{fontsize} || $self->{fontsize},
3116 max_w => $::WIDTH * 0.44,
3117 fg => $item->{fg},
3118 can_events => 1,
3119 can_hover => 1
3120 };
3121 }
3122
3123 $self->clear;
3124 $self->SUPER::add (reverse @widgets);
3125}
3126
3127sub add {
3128 my ($self, $text, %arg) = @_;
3129
3130 $text =~ s/^\s+//;
3131 $text =~ s/\s+$//;
3132
3133 return unless $text;
3134
3135 my $timeout = time + ((delete $arg{timeout}) || 60);
3136
3137 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3138
3139 if (my $item = $self->{item}{$group}) {
3140 if ($item->{text} eq $text) {
3141 $item->{count}++;
3142 } else {
3143 $item->{count} = 1;
3144 $item->{text} = $item->{tooltip} = $text;
3145 }
3146 $item->{id} = ++$self->{id};
3147 $item->{timeout} = $timeout;
3148 delete $item->{label};
3149 } else {
3150 $self->{item}{$group} = {
3151 id => ++$self->{id},
3152 text => $text,
3153 timeout => $timeout,
3154 tooltip => $text,
3155 fg => [0.8, 0.8, 0.8, 0.8],
3156 pri => 0,
3157 count => 1,
3158 %arg,
3159 };
3160 }
3161
3162 $self->reorder;
3163}
3164
3165sub reconfigure {
3166 my ($self) = @_;
3167
3168 delete $_->{label}
3169 for values %{ $self->{item} || {} };
3170
3171 $self->reorder;
3172 $self->SUPER::reconfigure;
3173}
3174
3175#############################################################################
3176
3177package CFClient::UI::Inventory;
3178
3179our @ISA = CFClient::UI::ScrolledWindow::;
3180
3181sub new {
3182 my $class = shift;
3183
3184 my $self = $class->SUPER::new (
3185 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3186 @_,
3187 );
3188
3189 $self
3190}
3191
3192sub set_items {
3193 my ($self, $items) = @_;
3194
3195 $self->{child}->clear;
3196 return unless $items;
3197
3198 my @items = sort {
3199 ($a->{type} <=> $b->{type})
3200 or ($a->{name} cmp $b->{name})
3201 } @$items;
3202
3203 $self->{real_items} = \@items;
3204
3205 my $row = 0;
3206 for my $item (@items) {
3207 CFClient::Item::update_widgets $item;
3208
3209 $self->{child}->add (0, $row, $item->{face_widget});
3210 $self->{child}->add (1, $row, $item->{desc_widget});
3211 $self->{child}->add (2, $row, $item->{weight_widget});
3212
3213 $row++;
3214 }
3215}
3216
3217#############################################################################
3218
3219package CFClient::UI::BindEditor;
3220
3221our @ISA = CFClient::UI::FancyFrame::;
3222
3223sub new {
3224 my $class = shift;
3225
3226 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3227
3228 $self->add (my $vb = new CFClient::UI::VBox);
3229
3230
3231 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3232 text => "start recording",
3233 tooltip => "Start/Stops recording of actions."
3234 ."All subsequent actions after the recording started will be captured."
3235 ."The actions are displayed after the record was stopped."
3236 ."To bind the action you have to click on the 'Bind' button",
3237 on_activate => sub {
3238 unless ($self->{recording}) {
3239 $self->start;
3240 } else {
3241 $self->stop;
3242 }
3243 });
3244
3245 $vb->add (new CFClient::UI::Label text => "Actions:");
3246 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3247
3248 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3249 $vb->add (my $hb = new CFClient::UI::HBox);
3250 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3251 $hb->add (new CFClient::UI::Button
3252 text => "bind",
3253 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3254 on_activate => sub {
3255 $self->ask_for_bind;
3256 });
3257
3258 $vb->add (my $hb = new CFClient::UI::HBox);
3259 $hb->add (new CFClient::UI::Button
3260 text => "ok",
3261 expand => 1,
3262 tooltip => "This closes the binding editor and saves the binding",
3263 on_activate => sub {
3264 $self->hide;
3265 $self->commit;
3266 });
3267
3268 $hb->add (new CFClient::UI::Button
3269 text => "cancel",
3270 expand => 1,
3271 tooltip => "This closes the binding editor without saving",
3272 on_activate => sub {
3273 $self->hide;
3274 $self->{binding_cancel}->()
3275 if $self->{binding_cancel};
3276 });
3277
3278 $self->update_binding_widgets;
3279
3280 $self
3281}
3282
3283sub commit {
3284 my ($self) = @_;
3285 my ($mod, $sym, $cmds) = $self->get_binding;
3286 if ($sym != 0 && @$cmds > 0) {
3287 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3288 ."'. Don't forget 'Save Config'!");
3289 $self->{binding_change}->($mod, $sym, $cmds)
3290 if $self->{binding_change};
3291 } else {
3292 $::STATUSBOX->add ("No action bound, no key or action specified!");
3293 $self->{binding_cancel}->()
3294 if $self->{binding_cancel};
3295 }
3296}
3297
3298sub start {
3299 my ($self) = @_;
3300
3301 $self->{rec_btn}->set_text ("stop recording");
3302 $self->{recording} = 1;
3303 $self->clear_command_list;
3304 $::CONN->start_record if $::CONN;
3305}
3306
3307sub stop {
3308 my ($self) = @_;
3309
3310 $self->{rec_btn}->set_text ("start recording");
3311 $self->{recording} = 0;
3312
3313 my $rec;
3314 $rec = $::CONN->stop_record if $::CONN;
3315 return unless ref $rec eq 'ARRAY';
3316 $self->set_command_list ($rec);
3317}
3318
3319
3320sub ask_for_bind_and_commit {
3321 my ($self) = @_;
3322 $self->ask_for_bind (1);
3323}
3324
3325sub ask_for_bind {
3326 my ($self, $commit) = @_;
3327
3328 CFClient::Binder::open_binding_dialog (sub {
3329 my ($mod, $sym) = @_;
3330 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3331 $self->update_binding_widgets;
3332 $self->commit if $commit;
3333 });
3334}
3335
3336# $mod and $sym are the modifiers and key symbol
3337# $cmds is a array ref of strings (the commands)
3338# $cb is the callback that is executed on OK
3339# $ccb is the callback that is executed on CANCEL and
3340# when the binding was unsuccessful on OK
3341sub set_binding {
3342 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3343
3344 $self->clear_command_list;
3345 $self->{recording} = 0;
3346 $self->{rec_btn}->set_text ("start recording");
3347
3348 $self->{binding} = [$mod, $sym];
3349 $self->{commands} = $cmds;
3350
3351 $self->{binding_change} = $cb;
3352 $self->{binding_cancel} = $ccb;
3353
3354 $self->update_binding_widgets;
3355}
3356
3357# this is a shortcut method that asks for a binding
3358# and then just binds it.
3359sub do_quick_binding {
3360 my ($self, $cmds) = @_;
3361 $self->set_binding (undef, undef, $cmds, sub {
3362 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3363 });
3364 $self->ask_for_bind (1);
3365}
3366
3367sub update_binding_widgets {
3368 my ($self) = @_;
3369 my ($mod, $sym, $cmds) = $self->get_binding;
3370 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3371 $self->set_command_list ($cmds);
3372}
3373
3374sub get_binding {
3375 my ($self) = @_;
3376 return (
3377 $self->{binding}->[0],
3378 $self->{binding}->[1],
3379 [ grep { defined $_ } @{$self->{commands}} ]
3380 );
3381}
3382
3383sub clear_command_list {
3384 my ($self) = @_;
3385 $self->{cmdbox}->clear ();
3386}
3387
3388sub set_command_list {
3389 my ($self, $cmds) = @_;
3390
3391 $self->{cmdbox}->clear ();
3392 $self->{commands} = $cmds;
3393
3394 my $idx = 0;
3395
3396 for (@$cmds) {
3397 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3398
3399 my $i = $idx;
3400 $hb->add (new CFClient::UI::Label text => $_);
3401 $hb->add (new CFClient::UI::Button
3402 text => "delete",
3403 tooltip => "Deletes the action from the record",
3404 on_activate => sub {
3405 $self->{cmdbox}->remove ($hb);
3406 $cmds->[$i] = undef;
3407 });
3408
3409
3410 $idx++
3411 }
3412}
3413
3414#############################################################################
3415
3416package CFClient::UI::SpellList;
3417
3418our @ISA = CFClient::UI::Table::;
3419
3420sub new {
3421 my $class = shift;
3422
3423 my $self = $class->SUPER::new (
3424 binding => [],
3425 commands => [],
3426 @_,
3427 )
3428}
3429
3430# XXX: Do sorting? Argl...
3431sub add_spell {
3432 my ($self, $spell) = @_;
3433 $self->{spells}->{$spell->{name}} = $spell;
3434
3435 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3436 face => $spell->{face},
3437 can_hover => 1,
3438 can_events => 1,
3439 tooltip => $spell->{message});
3440
3441 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3442 text => $spell->{name},
3443 can_hover => 1,
3444 can_events => 1,
3445 tooltip => $spell->{message},
3446 expand => 1);
3447
3448 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3449 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3450 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3451 expand => 1);
3452
3453 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3454 text => "bind to key",
3455 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3456}
3457
3458sub rebuild_spell_list {
3459 my ($self) = @_;
3460 $self->{tbl_idx} = 0;
3461 $self->add_spell ($_) for values %{$self->{spells}};
3462}
3463
3464sub remove_spell {
3465 my ($self, $spell) = @_;
3466 delete $self->{spells}->{$spell->{name}};
3467 $self->rebuild_spell_list;
3468}
3469
3470#############################################################################
3471
2207package CFClient::UI::Root; 3472package CFClient::UI::Root;
2208 3473
2209our @ISA = CFClient::UI::Container::; 3474our @ISA = CFClient::UI::Container::;
2210 3475
2211use CFClient::OpenGL; 3476use CFClient::OpenGL;
2212 3477
2213sub check_size { 3478sub new {
2214 my ($self) = @_; 3479 my $class = shift;
2215 3480
2216 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 3481 my $self = $class->SUPER::new (
3482 visible => 1,
3483 @_,
3484 );
3485
3486 Scalar::Util::weaken ($self->{root} = $self);
3487
3488 $self
2217} 3489}
2218 3490
2219sub size_request { 3491sub size_request {
2220 ($::WIDTH, $::HEIGHT) 3492 my ($self) = @_;
2221}
2222 3493
2223sub configure { 3494 ($self->{w}, $self->{h})
3495}
3496
3497sub _to_pixel {
3498 my ($coord, $size, $max) = @_;
3499
3500 $coord =
3501 $coord eq "center" ? ($max - $size) * 0.5
3502 : $coord eq "max" ? $max
3503 : $coord;
3504
3505 $coord = 0 if $coord < 0;
3506 $coord = $max - $size if $coord > $max - $size;
3507
3508 int $coord + 0.5
3509}
3510
3511sub size_allocate {
2224 my ($self, $x, $y, $w, $h) = @_; 3512 my ($self, $w, $h) = @_;
2225 3513
2226 $self->SUPER::configure ($x, $y, $w, $h);
2227
2228 for my $child (@{$self->{children}}) { 3514 for my $child ($self->children) {
2229 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3515 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2230 3516
2231 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3517 $X = $child->{force_x} if exists $child->{force_x};
2232 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3518 $Y = $child->{force_y} if exists $child->{force_y};
3519
3520 $X = _to_pixel $X, $W, $self->{w};
3521 $Y = _to_pixel $Y, $H, $self->{h};
3522
2233 $child->configure ($X, $Y, $W,$H); 3523 $child->configure ($X, $Y, $W, $H);
2234 } 3524 }
2235} 3525}
2236 3526
2237sub _topleft { 3527sub coord2local {
2238 my ($self, $x, $y) = @_; 3528 my ($self, $x, $y) = @_;
2239 3529
2240 ($x, $y) 3530 ($x, $y)
2241} 3531}
2242 3532
3533sub coord2global {
3534 my ($self, $x, $y) = @_;
3535
3536 ($x, $y)
3537}
3538
2243sub update { 3539sub update {
2244 my ($self) = @_; 3540 my ($self) = @_;
2245 3541
2246 $self->check_size; 3542 $::WANT_REFRESH++;
2247 ::refresh ();
2248} 3543}
2249 3544
2250sub add { 3545sub add {
2251 my ($self, $child) = @_; 3546 my ($self, @children) = @_;
2252 3547
2253 # integerize window positions 3548 $_->{is_toplevel} = 1
2254 $child->{x} = int $child->{x}; 3549 for @children;
2255 $child->{y} = int $child->{y};
2256 3550
2257 $self->SUPER::add ($child); 3551 $self->SUPER::add (@children);
3552}
3553
3554sub remove {
3555 my ($self, @children) = @_;
3556
3557 $self->SUPER::remove (@children);
3558
3559 delete $self->{is_toplevel}
3560 for @children;
3561
3562 while (@children) {
3563 my $w = pop @children;
3564 push @children, $w->children;
3565 $w->set_invisible;
3566 }
2258} 3567}
2259 3568
2260sub on_refresh { 3569sub on_refresh {
2261 my ($self, $id, $cb) = @_; 3570 my ($self, $id, $cb) = @_;
2262 3571
2263 $self->{refresh_hook}{$id} = $cb; 3572 $self->{refresh_hook}{$id} = $cb;
2264} 3573}
2265 3574
3575sub on_post_alloc {
3576 my ($self, $id, $cb) = @_;
3577
3578 $self->{post_alloc_hook}{$id} = $cb;
3579}
3580
2266sub draw { 3581sub draw {
2267 my ($self) = @_; 3582 my ($self) = @_;
2268 3583
2269 while (my $rcb = delete $self->{refresh_hook}) { 3584 while ($self->{refresh_hook}) {
2270 $_->() for values %$rcb; 3585 $_->()
3586 for values %{delete $self->{refresh_hook}};
2271 } 3587 }
3588
3589 if ($self->{realloc}) {
3590 my %queue;
3591 my @queue;
3592 my $widget;
3593
3594 outer:
3595 while () {
3596 if (my $realloc = delete $self->{realloc}) {
3597 for $widget (values %$realloc) {
3598 $widget->{visible} or next; # do not resize invisible widgets
3599
3600 $queue{$widget+0}++ and next; # duplicates are common
3601
3602 push @{ $queue[$widget->{visible}] }, $widget;
3603 }
3604 }
3605
3606 while () {
3607 @queue or last outer;
3608
3609 $widget = pop @{ $queue[-1] || [] }
3610 and last;
3611
3612 pop @queue;
3613 }
3614
3615 delete $queue{$widget+0};
3616
3617 my ($w, $h) = $widget->size_request;
3618
3619 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3620 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3621
3622 $w = $widget->{force_w} if exists $widget->{force_w};
3623 $h = $widget->{force_h} if exists $widget->{force_h};
3624
3625 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3626 || delete $widget->{force_realloc}) {
3627 $widget->{req_w} = $w;
3628 $widget->{req_h} = $h;
3629
3630 $self->{size_alloc}{$widget+0} = $widget;
3631
3632 if (my $parent = $widget->{parent}) {
3633 $self->{realloc}{$parent+0} = $parent
3634 unless $queue{$parent+0};
3635
3636 $parent->{force_size_alloc} = 1;
3637 $self->{size_alloc}{$parent+0} = $parent;
3638 }
3639 }
3640
3641 delete $self->{realloc}{$widget+0};
3642 }
3643 }
3644
3645 while (my $size_alloc = delete $self->{size_alloc}) {
3646 my @queue = sort { $b->{visible} <=> $a->{visible} }
3647 values %$size_alloc;
3648
3649 while () {
3650 my $widget = pop @queue || last;
3651
3652 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3653
3654 $w = 0 if $w < 0;
3655 $h = 0 if $h < 0;
3656
3657 $w = int $w + 0.5;
3658 $h = int $h + 0.5;
3659
3660 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3661 $widget->{old_w} = $widget->{w};
3662 $widget->{old_h} = $widget->{h};
3663
3664 $widget->{w} = $w;
3665 $widget->{h} = $h;
3666
3667 $widget->emit (size_allocate => $w, $h);
3668 }
3669 }
3670 }
3671
3672 while ($self->{post_alloc_hook}) {
3673 $_->()
3674 for values %{delete $self->{post_alloc_hook}};
3675 }
3676
2272 3677
2273 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3678 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2274 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3679 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2275 glClear GL_COLOR_BUFFER_BIT; 3680 glClear GL_COLOR_BUFFER_BIT;
2276 3681
2277 glMatrixMode GL_PROJECTION; 3682 glMatrixMode GL_PROJECTION;
2278 glLoadIdentity; 3683 glLoadIdentity;
2279 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3684 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2280 glMatrixMode GL_MODELVIEW; 3685 glMatrixMode GL_MODELVIEW;
2281 glLoadIdentity; 3686 glLoadIdentity;
2282 3687
3688 {
3689 package CFClient::UI::Base;
3690
3691 ($draw_x, $draw_y, $draw_w, $draw_h) =
3692 (0, 0, $self->{w}, $self->{h});
3693 }
3694
2283 $self->_draw; 3695 $self->_draw;
2284} 3696}
2285 3697
2286############################################################################# 3698#############################################################################
2287 3699
2288package CFClient::UI; 3700package CFClient::UI;
2289 3701
2290$ROOT = new CFClient::UI::Root; 3702$ROOT = new CFClient::UI::Root;
2291$TOOLTIP = new CFClient::UI::Tooltip; 3703$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2292 3704
22931 37051
2294 3706

Diff Legend

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