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.272 by root, Sat Jun 3 01:47:14 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;
669 glEnable GL_TEXTURE_2D;
670 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
671
672# glBegin GL_QUADS;
673# glColor 0, 0, 0, 0;
674# glVertex 0 , 0;
675# glVertex 0 , $h;
676# glVertex $w, $h;
677# glVertex $w, 0;
678# glEnd;
679
680
681 $self->child->draw;
682 glDisable GL_BLEND;
683 glDisable GL_TEXTURE_2D;
684} 912}
685 913
686############################################################################# 914# hmm, this does not work for topleft of $self... but we should not ask for that
915sub coord2local {
916 my ($self, $x, $y) = @_;
687 917
688package CFClient::UI::FancyFrame; 918 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
919}
689 920
921sub coord2global {
922 my ($self, $x, $y) = @_;
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;
951}
952
953#############################################################################
954
955package CFClient::UI::ScrolledWindow;
956
690our @ISA = CFClient::UI::Bin::; 957our @ISA = CFClient::UI::HBox::;
691
692use 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 958
698sub new { 959sub new {
699 my $class = shift; 960 my $class = shift;
700 961
701 # TODO: user_x, user_y, overwrite moveto? 962 my $self;
963
964 my $slider = new CFClient::UI::Slider
965 vertical => 1,
966 range => [0, 0, 1, 0.01], # HACK fix
967 on_changed => sub {
968 $self->{vp}->set_offset (0, $_[1]);
969 },
970 ;
971
972 $self = $class->SUPER::new (
973 vp => (new CFClient::UI::ViewPort expand => 1),
974 slider => $slider,
975 @_,
976 );
977
978 $self->{vp}->add ($self->{scrolled});
979 $self->add ($self->{vp});
980 $self->add ($self->{slider});
981
982 $self
983}
984
985sub update {
986 my ($self) = @_;
987
988 $self->SUPER::update;
989
990 # todo: overwrite size_allocate of child
991 my $child = $self->{vp}->child;
992 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
993}
994
995sub size_allocate {
996 my ($self, $w, $h) = @_;
997
998 $self->SUPER::size_allocate ($w, $h);
999
1000 my $child = $self->{vp}->child;
1001 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1002}
1003
1004#TODO# update range on size_allocate depending on child
1005# update viewport offset on scroll
1006
1007#############################################################################
1008
1009package CFClient::UI::Frame;
1010
1011our @ISA = CFClient::UI::Bin::;
1012
1013use CFClient::OpenGL;
1014
1015sub new {
1016 my $class = shift;
1017
1018 $class->SUPER::new (
1019 bg => undef,
1020 @_,
1021 )
1022}
1023
1024sub _draw {
1025 my ($self) = @_;
1026
1027 if ($self->{bg}) {
1028 my ($w, $h) = @$self{qw(w h)};
1029
1030 glEnable GL_BLEND;
1031 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1032 glColor @{ $self->{bg} };
1033
1034 glBegin GL_QUADS;
1035 glVertex 0 , 0;
1036 glVertex 0 , $h;
1037 glVertex $w, $h;
1038 glVertex $w, 0;
1039 glEnd;
1040
1041 glDisable GL_BLEND;
1042 }
1043
1044 $self->SUPER::_draw;
1045}
1046
1047#############################################################################
1048
1049package CFClient::UI::FancyFrame;
1050
1051our @ISA = CFClient::UI::Bin::;
1052
1053use CFClient::OpenGL;
1054
1055my $bg =
1056 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1057 mipmap => 1, wrap => 1;
1058
1059my @border =
1060 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1061 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1062
1063sub new {
1064 my ($class, %arg) = @_;
1065
1066 my $title = delete $arg{title};
702 1067
703 my $self = $class->SUPER::new ( 1068 my $self = $class->SUPER::new (
704 bg => [1, 1, 1, 1], 1069 bg => [1, 1, 1, 1],
705 border_bg => [1, 1, 1, 1], 1070 border_bg => [1, 1, 1, 1],
706 border => 0.8, 1071 border => 0.6,
707 can_events => 1, 1072 can_events => 1,
708 @_ 1073 min_w => 16,
1074 min_h => 16,
1075 %arg,
709 ); 1076 );
710 1077
711 $self->{title} &&= new CFClient::UI::Label 1078 $self->{title} = new CFClient::UI::Label
712 align => 0, 1079 align => 0,
713 valign => 1, 1080 valign => 1,
714 text => $self->{title}, 1081 text => $title,
715 fontsize => 1; 1082 fontsize => $self->{border}
1083 if defined $title;
716 1084
717 $self 1085 $self
1086}
1087
1088sub add {
1089 my ($self, @widgets) = @_;
1090
1091 $self->SUPER::add (@widgets);
1092 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
718} 1093}
719 1094
720sub border { 1095sub border {
721 int $_[0]{border} * $::FONTSIZE 1096 int $_[0]{border} * $::FONTSIZE
722} 1097}
723 1098
724sub size_request { 1099sub size_request {
725 my ($self) = @_; 1100 my ($self) = @_;
726 1101
727 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h}; 1102 $self->{title}->size_request
1103 if $self->{title};
728 1104
729 my ($w, $h) = $self->SUPER::size_request; 1105 my ($w, $h) = $self->SUPER::size_request;
730 1106
731 ( 1107 (
732 $w + $self->border * 2, 1108 $w + $self->border * 2,
… …
735} 1111}
736 1112
737sub size_allocate { 1113sub size_allocate {
738 my ($self, $w, $h) = @_; 1114 my ($self, $w, $h) = @_;
739 1115
1116 if ($self->{title}) {
1117 $self->{title}{w} = $w;
1118 $self->{title}{h} = $h;
1119 $self->{title}->size_allocate ($w, $h);
1120 }
1121
1122 my $border = $self->border;
1123
740 $h -= List::Util::max 0, $self->border * 2; 1124 $h -= List::Util::max 0, $border * 2;
741 $w -= List::Util::max 0, $self->border * 2; 1125 $w -= List::Util::max 0, $border * 2;
742 1126
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); 1127 $self->child->configure ($border, $border, $w, $h);
747} 1128}
748 1129
749sub button_down { 1130sub button_down {
750 my ($self, $ev, $x, $y) = @_; 1131 my ($self, $ev, $x, $y) = @_;
751 1132
1133 my ($w, $h) = @$self{qw(w h)};
752 my $border = $self->border; 1134 my $border = $self->border;
753 1135
754 if ($x < $self->{w} && $x >= $self->{w} - $border 1136 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
755 && $y < $self->{h} && $y >= $self->{h} - $border) { 1137 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
756 1138
1139 if ($lr & $td) {
1140 my ($wx, $wy) = ($self->{x}, $self->{y});
757 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1141 my ($ox, $oy) = ($ev->{x}, $ev->{y});
758 my ($bw, $bh) = ($self->{w}, $self->{h}); 1142 my ($bw, $bh) = ($self->{w}, $self->{h});
759 1143
1144 my $mx = $x < $border;
1145 my $my = $y < $border;
1146
760 $self->{motion} = sub { 1147 $self->{motion} = sub {
761 my ($ev, $x, $y) = @_; 1148 my ($ev, $x, $y) = @_;
762 1149
763 ($x, $y) = ($ev->{x}, $ev->{y}); 1150 my $dx = $ev->{x} - $ox;
1151 my $dy = $ev->{y} - $oy;
764 1152
765 $self->{user_w} = $bw + $x - $ox; 1153 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
766 $self->{user_h} = $bh + $y - $oy; 1154 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
767 $self->check_size; 1155
1156 $self->realloc;
1157 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
768 }; 1158 };
769 1159
770 } elsif ($x >= 0 && $x < $self->{w} 1160 } elsif ($lr ^ $td) {
771 && $y >= 0 && $y < $border) {
772
773 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1161 my ($ox, $oy) = ($ev->{x}, $ev->{y});
774 my ($bx, $by) = ($self->{x}, $self->{y}); 1162 my ($bx, $by) = ($self->{x}, $self->{y});
775 1163
776 $self->{motion} = sub { 1164 $self->{motion} = sub {
777 my ($ev, $x, $y) = @_; 1165 my ($ev, $x, $y) = @_;
778 1166
779 ($x, $y) = ($ev->{x}, $ev->{y}); 1167 ($x, $y) = ($ev->{x}, $ev->{y});
780 1168
781 $self->move ($bx + $x - $ox, $by + $y - $oy); 1169 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
782 $self->update;
783 }; 1170 };
1171 } else {
1172 return 0;
1173 }
1174
784 } 1175 1
785} 1176}
786 1177
787sub button_up { 1178sub button_up {
788 my ($self, $ev, $x, $y) = @_; 1179 my ($self, $ev, $x, $y) = @_;
789 1180
790 delete $self->{motion}; 1181 !!delete $self->{motion}
791} 1182}
792 1183
793sub mouse_motion { 1184sub mouse_motion {
794 my ($self, $ev, $x, $y) = @_; 1185 my ($self, $ev, $x, $y) = @_;
795 1186
796 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1187 $self->{motion}->($ev, $x, $y) if $self->{motion};
1188
1189 !!$self->{motion}
797} 1190}
798 1191
799sub _draw { 1192sub _draw {
800 my ($self) = @_; 1193 my ($self) = @_;
801 1194
1195 my $child = $self->{children}[0];
1196
802 my ($w, $h ) = ($self->{w}, $self->{h}); 1197 my ($w, $h ) = ($self->{w}, $self->{h});
803 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1198 my ($cw, $ch) = ($child->{w}, $child->{h});
804 1199
805 glEnable GL_BLEND;
806 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
807 glEnable GL_TEXTURE_2D; 1200 glEnable GL_TEXTURE_2D;
808 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1201 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
809 1202
810 my $border = $self->border; 1203 my $border = $self->border;
811 1204
812 glColor @{ $self->{border_bg} }; 1205 glColor @{ $self->{border_bg} };
813 $tex[1]->draw_quad (0, 0, $w, $border); 1206 $border[0]->draw_quad_alpha (0, 0, $w, $border);
814 $tex[3]->draw_quad (0, $border, $border, $ch); 1207 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
815 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1208 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
816 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1209 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
817 1210
818 my $bg = $tex[0]; 1211 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1212 glColor @{ $self->{bg} };
819 1213
820 # TODO: repeat texture not scale 1214 # TODO: repeat texture not scale
821 my $rep_x = $cw / $bg->{w}; 1215 # solve this better(?)
822 my $rep_y = $ch / $bg->{h}; 1216 $bg->{s} = $cw / $bg->{w};
823 1217 $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); 1218 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1219 }
830 1220
831 glDisable GL_TEXTURE_2D; 1221 glDisable GL_TEXTURE_2D;
832 glDisable GL_BLEND;
833 1222
834 $self->{title}->draw if $self->{title};
835 $self->child->draw; 1223 $child->draw;
1224
1225 if ($self->{title}) {
1226 glTranslate 0, $border - $self->{h};
1227 $self->{title}->_draw;
1228 }
836} 1229}
837 1230
838############################################################################# 1231#############################################################################
839 1232
840package CFClient::UI::Table; 1233package CFClient::UI::Table;
… …
848sub new { 1241sub new {
849 my $class = shift; 1242 my $class = shift;
850 1243
851 $class->SUPER::new ( 1244 $class->SUPER::new (
852 col_expand => [], 1245 col_expand => [],
853 @_ 1246 @_,
854 ) 1247 )
1248}
1249
1250sub children {
1251 grep $_, map @$_, grep $_, @{ $_[0]{children} }
855} 1252}
856 1253
857sub add { 1254sub add {
858 my ($self, $x, $y, $child) = @_; 1255 my ($self, $x, $y, $child) = @_;
859 1256
860 $child->set_parent ($self); 1257 $child->set_parent ($self);
861 $self->{children}[$y][$x] = $child; 1258 $self->{children}[$y][$x] = $child;
862 1259
863 $child->check_size; 1260 $self->realloc;
864} 1261}
865 1262
866# TODO: move to container class maybe? send childs a signal on removal? 1263# TODO: move to container class maybe? send children a signal on removal?
867sub clear { 1264sub clear {
868 my ($self) = @_; 1265 my ($self) = @_;
869 1266
1267 my @children = $self->children;
870 delete $self->{children}; 1268 delete $self->{children};
871 $self->update; 1269
1270 for (@children) {
1271 delete $_->{parent};
1272 $_->hide;
1273 }
1274
1275 $self->realloc;
872} 1276}
873 1277
874sub get_wh { 1278sub get_wh {
875 my ($self) = @_; 1279 my ($self) = @_;
876 1280
… …
907sub size_allocate { 1311sub size_allocate {
908 my ($self, $w, $h) = @_; 1312 my ($self, $w, $h) = @_;
909 1313
910 my ($ws, $hs) = $self->get_wh; 1314 my ($ws, $hs) = $self->get_wh;
911 1315
912 my $req_w = sum @$ws; 1316 my $req_w = (sum @$ws) || 1;
913 my $req_h = sum @$hs; 1317 my $req_h = (sum @$hs) || 1;
914 1318
915 # TODO: nicer code && do row_expand 1319 # TODO: nicer code && do row_expand
916 my @col_expand = @{$self->{col_expand}}; 1320 my @col_expand = @{$self->{col_expand}};
917 @col_expand = (1) x @$ws unless @col_expand; 1321 @col_expand = (1) x @$ws unless @col_expand;
918 my $col_expand = (sum @col_expand) || 1; 1322 my $col_expand = (sum @col_expand) || 1;
… …
972 } 1376 }
973} 1377}
974 1378
975############################################################################# 1379#############################################################################
976 1380
977package CFClient::UI::HBox; 1381package CFClient::UI::Box;
978
979# TODO: wrap into common Box base class
980 1382
981our @ISA = CFClient::UI::Container::; 1383our @ISA = CFClient::UI::Container::;
982 1384
983sub size_request { 1385sub size_request {
984 my ($self) = @_; 1386 my ($self) = @_;
985 1387
986 my @alloc = map [$_->size_request], @{$self->{children}}; 1388 $self->{vertical}
987 1389 ? (
988 ( 1390 (List::Util::max map $_->{req_w}, @{$self->{children}}),
989 (List::Util::sum map $_->[0], @alloc), 1391 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
990 (List::Util::max map $_->[1], @alloc), 1392 )
991 ) 1393 : (
1394 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1395 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1396 )
992} 1397}
993 1398
994sub size_allocate { 1399sub size_allocate {
995 my ($self, $w, $h) = @_; 1400 my ($self, $w, $h) = @_;
996 1401
997 ($h, $w) = ($w, $h); 1402 my $space = $self->{vertical} ? $h : $w;
998
999 my $children = $self->{children}; 1403 my $children = $self->{children};
1000 1404
1001 my @h = map $_->{req_w}, @$children; 1405 my @req;
1002 1406
1003 my $req_h = List::Util::sum @h; 1407 if ($self->{homogeneous}) {
1004 1408 @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 { 1409 } else {
1410 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1411 my $req = List::Util::sum @req;
1412
1413 if ($req > $space) {
1414 # ah well, not enough space
1415 $_ *= $space / $req for @req;
1416 } else {
1009 my $exp = List::Util::sum map $_->{expand}, @$children; 1417 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1010 $exp ||= 1;
1011 1418
1419 $space = ($space - $req) / $expand; # remaining space to give away
1420
1421 $req[$_] += $space * $children->[$_]{expand}
1012 for (0 .. $#$children) { 1422 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 } 1423 }
1019 } 1424 }
1020 1425
1021 CFClient::UI::harmonize \@h; 1426 CFClient::UI::harmonize \@req;
1022 1427
1023 my $y = 0; 1428 my $pos = 0;
1024 for (0 .. $#$children) { 1429 for (0 .. $#$children) {
1025 my $child = $children->[$_];
1026 my $h = $h[$_]; 1430 my $alloc = $req[$_];
1027 $child->configure ($y, 0, $h, $w); 1431 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1028 1432
1029 $y += $h; 1433 $pos += $alloc;
1030 } 1434 }
1031 1435
1032 1 1436 1
1033} 1437}
1034 1438
1035############################################################################# 1439#############################################################################
1036 1440
1441package CFClient::UI::HBox;
1442
1443our @ISA = CFClient::UI::Box::;
1444
1445sub new {
1446 my $class = shift;
1447
1448 $class->SUPER::new (
1449 vertical => 0,
1450 @_,
1451 )
1452}
1453
1454#############################################################################
1455
1037package CFClient::UI::VBox; 1456package CFClient::UI::VBox;
1038 1457
1039# TODO: wrap into common Box base class
1040
1041our @ISA = CFClient::UI::Container::; 1458our @ISA = CFClient::UI::Box::;
1042 1459
1043sub size_request { 1460sub new {
1044 my ($self) = @_; 1461 my $class = shift;
1045 1462
1046 my @alloc = map [$_->size_request], @{$self->{children}}; 1463 $class->SUPER::new (
1047 1464 vertical => 1,
1048 ( 1465 @_,
1049 (List::Util::max map $_->[0], @alloc),
1050 (List::Util::sum map $_->[1], @alloc),
1051 ) 1466 )
1052} 1467}
1053 1468
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############################################################################# 1469#############################################################################
1092 1470
1093package CFClient::UI::Label; 1471package CFClient::UI::Label;
1094 1472
1095our @ISA = CFClient::UI::Base::; 1473our @ISA = CFClient::UI::DrawBG::;
1096 1474
1097use CFClient::OpenGL; 1475use CFClient::OpenGL;
1098 1476
1099sub new { 1477sub new {
1100 my ($class, %arg) = @_; 1478 my ($class, %arg) = @_;
1101 1479
1102 my $self = $class->SUPER::new ( 1480 my $self = $class->SUPER::new (
1103 fg => [1, 1, 1], 1481 fg => [1, 1, 1],
1482 #bg => none
1483 #active_bg => none
1484 #font => default_font
1485 #text => initial text
1486 #markup => initial narkup
1487 #max_w => maximum pixel width
1488 ellipsise => 3, # end
1489 layout => (new CFClient::Layout),
1104 fontsize => 1, 1490 fontsize => 1,
1105 text => "",
1106 align => -1, 1491 align => -1,
1107 valign => -1, 1492 valign => -1,
1108 padding => 2, 1493 padding_x => 2,
1109 layout => new CFClient::Layout, 1494 padding_y => 2,
1110 can_events => 0, 1495 can_events => 0,
1111 %arg 1496 %arg
1112 ); 1497 );
1113 1498
1114 if (exists $self->{template}) { 1499 if (exists $self->{template}) {
1115 my $layout = new CFClient::Layout; 1500 my $layout = new CFClient::Layout;
1116 $layout->set_text (delete $self->{template}); 1501 $layout->set_text (delete $self->{template});
1117 $self->{template} = $layout; 1502 $self->{template} = $layout;
1118 } 1503 }
1119 1504
1120 $self->set_text (delete $self->{text}) if exists $self->{text}; 1505 if (exists $self->{markup}) {
1121 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1506 $self->set_markup (delete $self->{markup});
1507 } else {
1508 $self->set_text (delete $self->{text});
1509 }
1122 1510
1123 $self 1511 $self
1124} 1512}
1125 1513
1126sub escape_text { 1514sub escape($) {
1127 local $_ = $_[1]; 1515 local $_ = $_[0];
1128 1516
1129 s/&/&amp;/g; 1517 s/&/&amp;/g;
1130 s/>/&gt;/g; 1518 s/>/&gt;/g;
1131 s/</&lt;/g; 1519 s/</&lt;/g;
1132 1520
1133 $_[1] 1521 $_
1522}
1523
1524sub update {
1525 my ($self) = @_;
1526
1527 delete $self->{texture};
1528 $self->SUPER::update;
1134} 1529}
1135 1530
1136sub set_text { 1531sub set_text {
1137 my ($self, $text) = @_; 1532 my ($self, $text) = @_;
1138 1533
1534 return if $self->{text} eq "T$text";
1535 $self->{text} = "T$text";
1536
1537 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1139 $self->{layout}->set_text ($text); 1538 $self->{layout}->set_text ($text);
1140 1539
1141 delete $self->{texture}; 1540 $self->realloc;
1142 $self->check_size;
1143 $self->update; 1541 $self->update;
1144} 1542}
1145 1543
1146sub set_markup { 1544sub set_markup {
1147 my ($self, $markup) = @_; 1545 my ($self, $markup) = @_;
1148 1546
1547 return if $self->{text} eq "M$markup";
1548 $self->{text} = "M$markup";
1549
1550 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1551
1552 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1149 $self->{layout}->set_markup ($markup); 1553 $self->{layout}->set_markup ($markup);
1150 1554
1151 delete $self->{texture}; 1555 $self->realloc;
1152 $self->check_size;
1153 $self->update; 1556 $self->update;
1154} 1557}
1155 1558
1156sub size_request { 1559sub size_request {
1157 my ($self) = @_; 1560 my ($self) = @_;
1158 1561
1159 $self->{layout}->set_width; 1562 $self->{layout}->set_font ($self->{font}) if $self->{font};
1563 $self->{layout}->set_width ($self->{max_w} || -1);
1564 $self->{layout}->set_ellipsise ($self->{ellipsise});
1565 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1160 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1566 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1161 1567
1162 my ($w, $h) = $self->{layout}->size; 1568 my ($w, $h) = $self->{layout}->size;
1163 1569
1164 if (exists $self->{template}) { 1570 if (exists $self->{template}) {
1571 $self->{template}->set_font ($self->{font}) if $self->{font};
1165 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1572 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1166 1573
1167 my ($w2, $h2) = $self->{template}->size; 1574 my ($w2, $h2) = $self->{template}->size;
1168 1575
1169 $w = List::Util::max $w, $w2; 1576 $w = List::Util::max $w, $w2;
1170 $h = List::Util::max $h, $h2; 1577 $h = List::Util::max $h, $h2;
1171 } 1578 }
1172 1579
1173 ( 1580 ($w, $h)
1174 $w + $self->{padding} * 2,
1175 $h + $self->{padding} * 2,
1176 )
1177} 1581}
1178 1582
1179sub size_allocate { 1583sub size_allocate {
1180 my ($self, $w, $h) = @_; 1584 my ($self, $w, $h) = @_;
1181 1585
1586 delete $self->{ox};
1587
1182 delete $self->{texture}; 1588 delete $self->{texture}
1589 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1183} 1590}
1184 1591
1185sub set_fontsize { 1592sub set_fontsize {
1186 my ($self, $fontsize) = @_; 1593 my ($self, $fontsize) = @_;
1187 1594
1188 $self->{fontsize} = $fontsize; 1595 $self->{fontsize} = $fontsize;
1189 delete $self->{texture}; 1596 delete $self->{texture};
1190 $self->check_size; 1597
1191 $self->update; 1598 $self->realloc;
1192} 1599}
1193 1600
1194sub _draw { 1601sub _draw {
1195 my ($self) = @_; 1602 my ($self) = @_;
1196 1603
1604 $self->SUPER::_draw; # draw background, if applicable
1605
1197 my $tex = $self->{texture} ||= do { 1606 my $tex = $self->{texture} ||= do {
1607 $self->{layout}->set_foreground (@{$self->{fg}});
1608 $self->{layout}->set_font ($self->{font}) if $self->{font};
1198 $self->{layout}->set_width ($self->{w}); 1609 $self->{layout}->set_width ($self->{w});
1610 $self->{layout}->set_ellipsise ($self->{ellipsise});
1611 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1199 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1612 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1613
1200 new_from_layout CFClient::Texture $self->{layout} 1614 new_from_layout CFClient::Texture $self->{layout}
1201 }; 1615 };
1202 1616
1203 glEnable GL_BLEND; 1617 unless (exists $self->{ox}) {
1204 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1618 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1619 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1620 : ($self->{w} - $tex->{w}) * 0.5);
1621
1622 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1623 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1624 : ($self->{h} - $tex->{h}) * 0.5);
1625 };
1626
1205 glEnable GL_TEXTURE_2D; 1627 glEnable GL_TEXTURE_2D;
1206 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1628 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1207 1629
1630 if ($tex->{format} == GL_ALPHA) {
1208 glColor @{$self->{fg}}; 1631 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}); 1632 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1633 } else {
1634 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1635 }
1223 1636
1224 glDisable GL_TEXTURE_2D; 1637 glDisable GL_TEXTURE_2D;
1225 glDisable GL_BLEND;
1226} 1638}
1227 1639
1228############################################################################# 1640#############################################################################
1229 1641
1230package CFClient::UI::EntryBase; 1642package CFClient::UI::EntryBase;
… …
1235 1647
1236sub new { 1648sub new {
1237 my $class = shift; 1649 my $class = shift;
1238 1650
1239 $class->SUPER::new ( 1651 $class->SUPER::new (
1240 fg => [1, 1, 1], 1652 fg => [1, 1, 1],
1241 bg => [0, 0, 0, 0.2], 1653 bg => [0, 0, 0, 0.2],
1242 active_bg => [1, 1, 1, 0.5], 1654 active_bg => [1, 1, 1, 0.5],
1243 active_fg => [0, 0, 0], 1655 active_fg => [0, 0, 0],
1244 can_hover => 1, 1656 can_hover => 1,
1245 can_focus => 1, 1657 can_focus => 1,
1246 valign => 0, 1658 valign => 0,
1247 can_events => 1, 1659 can_events => 1,
1660 #text => ...
1248 @_ 1661 @_
1249 ) 1662 )
1250} 1663}
1251 1664
1252sub _set_text { 1665sub _set_text {
… …
1262 $self->{text} = $text; 1675 $self->{text} = $text;
1263 1676
1264 $text =~ s/./*/g if $self->{hidden}; 1677 $text =~ s/./*/g if $self->{hidden};
1265 $self->{layout}->set_text ("$text "); 1678 $self->{layout}->set_text ("$text ");
1266 1679
1267 $self->emit (changed => $self->{text}); 1680 $self->_emit (changed => $self->{text});
1681}
1682
1683sub set_text {
1684 my ($self, $text) = @_;
1685
1686 $self->{cursor} = length $text;
1687 $self->_set_text ($text);
1688
1689 $self->realloc;
1268} 1690}
1269 1691
1270sub get_text { 1692sub get_text {
1271 $_[0]{text} 1693 $_[0]{text}
1272} 1694}
… …
1275 my ($self) = @_; 1697 my ($self) = @_;
1276 1698
1277 my ($w, $h) = $self->SUPER::size_request; 1699 my ($w, $h) = $self->SUPER::size_request;
1278 1700
1279 ($w + 1, $h) # add 1 for cursor 1701 ($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} 1702}
1295 1703
1296sub key_down { 1704sub key_down {
1297 my ($self, $ev) = @_; 1705 my ($self, $ev) = @_;
1298 1706
… …
1300 my $sym = $ev->{sym}; 1708 my $sym = $ev->{sym};
1301 my $uni = $ev->{unicode}; 1709 my $uni = $ev->{unicode};
1302 1710
1303 my $text = $self->get_text; 1711 my $text = $self->get_text;
1304 1712
1305 if ($sym == 8) { 1713 if ($uni == 8) {
1306 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1714 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1307 } elsif ($sym == 127) { 1715 } elsif ($uni == 127) {
1308 substr $text, $self->{cursor}, 1, ""; 1716 substr $text, $self->{cursor}, 1, "";
1309 } elsif ($sym == CFClient::SDLK_LEFT) { 1717 } elsif ($sym == CFClient::SDLK_LEFT) {
1310 --$self->{cursor} if $self->{cursor}; 1718 --$self->{cursor} if $self->{cursor};
1311 } elsif ($sym == CFClient::SDLK_RIGHT) { 1719 } elsif ($sym == CFClient::SDLK_RIGHT) {
1312 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1720 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1313 } elsif ($sym == CFClient::SDLK_HOME) { 1721 } elsif ($sym == CFClient::SDLK_HOME) {
1314 $self->{cursor} = 0; 1722 $self->{cursor} = 0;
1315 } elsif ($sym == CFClient::SDLK_END) { 1723 } elsif ($sym == CFClient::SDLK_END) {
1316 $self->{cursor} = length $text; 1724 $self->{cursor} = length $text;
1317 } elsif ($sym == 27) { 1725 } elsif ($uni == 27) {
1318 $self->emit ('escape'); 1726 $self->_emit ('escape');
1319 } elsif ($uni) { 1727 } elsif ($uni) {
1320 substr $text, $self->{cursor}++, 0, chr $uni; 1728 substr $text, $self->{cursor}++, 0, chr $uni;
1729 } else {
1730 return 0;
1321 } 1731 }
1322 1732
1323 $self->_set_text ($text); 1733 $self->_set_text ($text);
1324 $self->update; 1734
1735 $self->realloc;
1736
1737 1
1325} 1738}
1326 1739
1327sub focus_in { 1740sub focus_in {
1328 my ($self) = @_; 1741 my ($self) = @_;
1329 1742
… …
1344 utf8::encode $text; 1757 utf8::encode $text;
1345 $self->{cursor} = length substr $text, 0, $idx; 1758 $self->{cursor} = length substr $text, 0, $idx;
1346 1759
1347 $self->_set_text ($self->{text}); 1760 $self->_set_text ($self->{text});
1348 $self->update; 1761 $self->update;
1762
1763 1
1349} 1764}
1350 1765
1351sub mouse_motion { 1766sub mouse_motion {
1352 my ($self, $ev, $x, $y) = @_; 1767 my ($self, $ev, $x, $y) = @_;
1353# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1768# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1769
1770 0
1354} 1771}
1355 1772
1356sub _draw { 1773sub _draw {
1357 my ($self) = @_; 1774 my ($self) = @_;
1358 1775
… …
1405 my ($self, $ev) = @_; 1822 my ($self, $ev) = @_;
1406 1823
1407 my $sym = $ev->{sym}; 1824 my $sym = $ev->{sym};
1408 1825
1409 if ($sym == 13) { 1826 if ($sym == 13) {
1827 unshift @{$self->{history}},
1828 my $txt = $self->get_text;
1829 $self->{history_pointer} = -1;
1830 $self->{history_saveback} = '';
1410 $self->emit (activate => $self->get_text); 1831 $self->_emit (activate => $txt);
1411 $self->update; 1832 $self->update;
1412 1833
1834 } elsif ($sym == CFClient::SDLK_UP) {
1835 if ($self->{history_pointer} < 0) {
1836 $self->{history_saveback} = $self->get_text;
1837 }
1838 if (@{$self->{history} || []} > 0) {
1839 $self->{history_pointer}++;
1840 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1841 $self->{history_pointer} = @{$self->{history} || []} - 1;
1842 }
1843 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1844 }
1845
1846 } elsif ($sym == CFClient::SDLK_DOWN) {
1847 $self->{history_pointer}--;
1848 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1849
1850 if ($self->{history_pointer} >= 0) {
1851 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1852 } else {
1853 $self->set_text ($self->{history_saveback});
1854 }
1855
1413 } else { 1856 } else {
1414 $self->SUPER::key_down ($ev); 1857 return $self->SUPER::key_down ($ev)
1858 }
1859
1415 } 1860 1
1416
1417} 1861}
1418 1862
1419############################################################################# 1863#############################################################################
1420 1864
1421package CFClient::UI::Button; 1865package CFClient::UI::Button;
… …
1430 1874
1431sub new { 1875sub new {
1432 my $class = shift; 1876 my $class = shift;
1433 1877
1434 $class->SUPER::new ( 1878 $class->SUPER::new (
1435 padding => 4, 1879 padding_x => 4,
1880 padding_y => 4,
1436 fg => [1, 1, 1], 1881 fg => [1, 1, 1],
1437 bg => [1, 1, 1, 0.2],
1438 active_fg => [0, 0, 1], 1882 active_fg => [0, 0, 1],
1439 can_hover => 1, 1883 can_hover => 1,
1440 align => 0, 1884 align => 0,
1441 valign => 0, 1885 valign => 0,
1442 can_events => 1, 1886 can_events => 1,
1443 @_ 1887 @_
1444 ) 1888 )
1445} 1889}
1446 1890
1891sub activate { }
1892
1447sub button_up { 1893sub button_up {
1448 my ($self, $ev, $x, $y) = @_; 1894 my ($self, $ev, $x, $y) = @_;
1449 1895
1896 $self->emit ("activate")
1450 if ($x >= 0 && $x < $self->{w} 1897 if $x >= 0 && $x < $self->{w}
1451 && $y >= 0 && $y < $self->{h}) { 1898 && $y >= 0 && $y < $self->{h};
1452 $self->emit ("activate"); 1899
1453 } 1900 1
1454} 1901}
1455 1902
1456sub _draw { 1903sub _draw {
1457 my ($self) = @_; 1904 my ($self) = @_;
1458 1905
… …
1460 1907
1461 if ($GRAB == $self) { 1908 if ($GRAB == $self) {
1462 $self->{fg} = $self->{active_fg}; 1909 $self->{fg} = $self->{active_fg};
1463 } 1910 }
1464 1911
1465 glEnable GL_BLEND;
1466 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1467 glEnable GL_TEXTURE_2D; 1912 glEnable GL_TEXTURE_2D;
1468 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1913 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1469 glColor 0, 0, 0, 1; 1914 glColor 0, 0, 0, 1;
1470 1915
1471 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1916 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1472 1917
1473 glDisable GL_TEXTURE_2D; 1918 glDisable GL_TEXTURE_2D;
1474 glDisable GL_BLEND;
1475 1919
1476 $self->SUPER::_draw; 1920 $self->SUPER::_draw;
1477} 1921}
1478 1922
1479############################################################################# 1923#############################################################################
… …
1490 1934
1491sub new { 1935sub new {
1492 my $class = shift; 1936 my $class = shift;
1493 1937
1494 $class->SUPER::new ( 1938 $class->SUPER::new (
1495 padding => 2, 1939 padding_x => 2,
1940 padding_y => 2,
1496 fg => [1, 1, 1], 1941 fg => [1, 1, 1],
1497 active_fg => [1, 1, 0], 1942 active_fg => [1, 1, 0],
1943 bg => [0, 0, 0, 0.2],
1944 active_bg => [1, 1, 1, 0.5],
1498 state => 0, 1945 state => 0,
1499 can_hover => 1, 1946 can_hover => 1,
1500 @_ 1947 @_
1501 ) 1948 )
1502} 1949}
1503 1950
1504sub size_request { 1951sub size_request {
1505 my ($self) = @_; 1952 my ($self) = @_;
1506 1953
1507 ($self->{padding} * 2 + 6) x 2 1954 (6) x 2
1508} 1955}
1509 1956
1510sub button_down { 1957sub button_down {
1511 my ($self, $ev, $x, $y) = @_; 1958 my ($self, $ev, $x, $y) = @_;
1512 1959
1513 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1960 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1514 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1961 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1515 $self->{state} = !$self->{state}; 1962 $self->{state} = !$self->{state};
1516 $self->emit (changed => $self->{state}); 1963 $self->_emit (changed => $self->{state});
1964 } else {
1965 return 0
1966 }
1967
1517 } 1968 1
1518} 1969}
1519 1970
1520sub _draw { 1971sub _draw {
1521 my ($self) = @_; 1972 my ($self) = @_;
1522 1973
1523 $self->SUPER::_draw; 1974 $self->SUPER::_draw;
1524 1975
1525 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1976 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1526 1977
1527 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1978 my ($w, $h) = @$self{qw(w h)};
1979
1980 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1528 1981
1529 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1982 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1530 1983
1531 glEnable GL_BLEND; 1984 my $tex = $self->{state} ? $tex[1] : $tex[0];
1985
1532 glEnable GL_TEXTURE_2D; 1986 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); 1987 $tex->draw_quad_alpha (0, 0, $s, $s);
1538
1539 glDisable GL_TEXTURE_2D; 1988 glDisable GL_TEXTURE_2D;
1540 glDisable GL_BLEND;
1541} 1989}
1542 1990
1543############################################################################# 1991#############################################################################
1544 1992
1545package CFClient::UI::Image; 1993package CFClient::UI::Image;
… …
1588 glTranslate 0, -$self->{w}, 0; 2036 glTranslate 0, -$self->{w}, 0;
1589 2037
1590 ($w, $h) = ($h, $w); 2038 ($w, $h) = ($h, $w);
1591 } 2039 }
1592 2040
1593 glEnable GL_BLEND;
1594 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1595 glEnable GL_TEXTURE_2D; 2041 glEnable GL_TEXTURE_2D;
1596 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2042 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1597 2043
1598 $tex->draw_quad (0, 0, $w, $h); 2044 $tex->draw_quad_alpha (0, 0, $w, $h);
1599 2045
1600 glDisable GL_BLEND;
1601 glDisable GL_TEXTURE_2D; 2046 glDisable GL_TEXTURE_2D;
1602} 2047}
1603 2048
1604############################################################################# 2049#############################################################################
1605 2050
1606package CFClient::UI::VGauge; 2051package CFClient::UI::VGauge;
1607 2052
1608our @ISA = CFClient::UI::Base::; 2053our @ISA = CFClient::UI::Base::;
2054
2055use List::Util qw(min max);
1609 2056
1610use CFClient::OpenGL; 2057use CFClient::OpenGL;
1611 2058
1612my %tex = ( 2059my %tex = (
1613 food => [ 2060 food => [
1614 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2061 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1615 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2062 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1616 ], 2063 ],
1617 grace => [ 2064 grace => [
1618 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2065 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1619 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ 2066 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1620 ], 2067 ],
1621 hp => [ 2068 hp => [
1622 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2069 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1623 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2070 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1624 ], 2071 ],
1625 mana => [ 2072 mana => [
1626 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2073 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1627 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ 2074 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1628 ], 2075 ],
1629); 2076);
1630 2077
1631# eg. VGauge->new (gauge => 'food'), default gauge: food 2078# eg. VGauge->new (gauge => 'food'), default gauge: food
1632sub new { 2079sub new {
… …
1651} 2098}
1652 2099
1653sub set_max { 2100sub set_max {
1654 my ($self, $max) = @_; 2101 my ($self, $max) = @_;
1655 2102
2103 return if $self->{max_val} == $max;
2104
1656 $self->{max_val} = $max; 2105 $self->{max_val} = $max;
2106 $self->update;
1657} 2107}
1658 2108
1659sub set_value { 2109sub set_value {
1660 my ($self, $val, $max) = @_; 2110 my ($self, $val, $max) = @_;
1661 2111
1662 $self->set_max ($max) 2112 $self->set_max ($max)
1663 if defined $max; 2113 if defined $max;
1664 2114
1665 $max = $self->{max_val}; 2115 return if $self->{val} == $val;
2116
1666 $self->{val} = $val; 2117 $self->{val} = $val;
1667
1668 $self->update; 2118 $self->update;
1669} 2119}
1670 2120
1671sub _draw { 2121sub _draw {
1672 my ($self) = @_; 2122 my ($self) = @_;
1673 2123
1674 my $tex = $tex{$self->{type}}; 2124 my $tex = $tex{$self->{type}};
2125 my ($t1, $t2, $t3) = @$tex;
1675 2126
1676 my ($w, $h) = ($self->{w}, $self->{h}); 2127 my ($w, $h) = ($self->{w}, $self->{h});
1677 2128
1678 if ($self->{vertical}) { 2129 if ($self->{vertical}) {
1679 glRotate 90, 0, 0, 1; 2130 glRotate 90, 0, 0, 1;
… …
1681 2132
1682 ($w, $h) = ($h, $w); 2133 ($w, $h) = ($h, $w);
1683 } 2134 }
1684 2135
1685 my $ycut = $self->{val} / ($self->{max_val} || 1); 2136 my $ycut = $self->{val} / ($self->{max_val} || 1);
1686 $ycut = 1 if $self->{val} > $self->{max_val};
1687 2137
1688 my $t1 = $tex->[0]; 2138 my $ycut1 = max 0, min 1, $ycut;
1689 my $t2 = $tex->[1]; 2139 my $ycut2 = max 0, min 1, $ycut - 1;
2140
2141 my $h1 = $self->{h} * (1 - $ycut1);
2142 my $h2 = $self->{h} * (1 - $ycut2);
1690 2143
1691 glEnable GL_BLEND; 2144 glEnable GL_BLEND;
1692 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2145 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1693 glEnable GL_TEXTURE_2D; 2146 glEnable GL_TEXTURE_2D;
1694 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2147 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1695 2148
1696 my $h1 = $self->{h} - $ycut * $self->{h};
1697 my $h2 = $ycut * $self->{h};
1698
1699 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2149 glBindTexture GL_TEXTURE_2D, $t1->{name};
1700 glBegin GL_QUADS; 2150 glBegin GL_QUADS;
1701 glTexCoord 0 , 0; glVertex 0 , 0; 2151 glTexCoord 0 , 0; glVertex 0 , 0;
1702 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 2152 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1703 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 2153 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1704 glTexCoord $t1->{s}, 0; glVertex $w, 0; 2154 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1705 glEnd; 2155 glEnd;
1706 2156
2157 my $ycut1 = List::Util::min 1, $ycut;
1707 glBindTexture GL_TEXTURE_2D, $t2->{name}; 2158 glBindTexture GL_TEXTURE_2D, $t2->{name};
1708 glBegin GL_QUADS; 2159 glBegin GL_QUADS;
1709 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 2160 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1710 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 2161 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1711 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 2162 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1712 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 2163 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1713 glEnd; 2164 glEnd;
2165
2166 if ($t3) {
2167 glBindTexture GL_TEXTURE_2D, $t3->{name};
2168 glBegin GL_QUADS;
2169 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2170 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
2171 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
2172 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2173 glEnd;
2174 }
1714 2175
1715 glDisable GL_BLEND; 2176 glDisable GL_BLEND;
1716 glDisable GL_TEXTURE_2D; 2177 glDisable GL_TEXTURE_2D;
1717} 2178}
1718 2179
… …
1724 2185
1725sub new { 2186sub new {
1726 my ($class, %arg) = @_; 2187 my ($class, %arg) = @_;
1727 2188
1728 my $self = $class->SUPER::new ( 2189 my $self = $class->SUPER::new (
1729 tooltip => $arg{type}, 2190 tooltip => $arg{type},
2191 can_hover => 1,
2192 can_events => 1,
1730 %arg, 2193 %arg,
1731 ); 2194 );
1732 2195
1733 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2196 $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); 2197 $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"); 2198 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1736 2199
1737 $self 2200 $self
1738} 2201}
1739 2202
… …
1742 2205
1743 $self->{value}->set_fontsize ($fsize); 2206 $self->{value}->set_fontsize ($fsize);
1744 $self->{max} ->set_fontsize ($fsize); 2207 $self->{max} ->set_fontsize ($fsize);
1745} 2208}
1746 2209
2210sub set_max {
2211 my ($self, $max) = @_;
2212
2213 $self->{gauge}->set_max ($max);
2214 $self->{max}->set_text ($max);
2215}
2216
1747sub set_value { 2217sub set_value {
1748 my ($self, $val, $max) = @_; 2218 my ($self, $val, $max) = @_;
1749 2219
1750 $self->set_max ($max) 2220 $self->set_max ($max)
1751 if defined $max; 2221 if defined $max;
1752 2222
1753 $self->{gauge}->set_value ($val, $max); 2223 $self->{gauge}->set_value ($val, $max);
1754 $self->{value}->set_text ($val); 2224 $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} 2225}
1763 2226
1764############################################################################# 2227#############################################################################
1765 2228
1766package CFClient::UI::Slider; 2229package CFClient::UI::Slider;
… …
1776 qw(s1_slider.png s1_slider_bg.png); 2239 qw(s1_slider.png s1_slider_bg.png);
1777 2240
1778sub new { 2241sub new {
1779 my $class = shift; 2242 my $class = shift;
1780 2243
1781 # range [value, low, high, page] 2244 # range [value, low, high, page, unit]
1782 2245
1783 # TODO: 0-width page 2246 # TODO: 0-width page
1784 # TODO: req_w/h are wrong with vertical 2247 # TODO: req_w/h are wrong with vertical
1785 # TODO: calculations are off 2248 # TODO: calculations are off
1786 my $self = $class->SUPER::new ( 2249 my $self = $class->SUPER::new (
1787 fg => [1, 1, 1], 2250 fg => [1, 1, 1],
1788 active_fg => [0, 0, 0], 2251 active_fg => [0, 0, 0],
2252 bg => [0, 0, 0, 0.2],
2253 active_bg => [1, 1, 1, 0.5],
1789 range => [0, 0, 100, 10], 2254 range => [0, 0, 100, 10, 0],
1790 req_w => 20, 2255 min_w => $::WIDTH / 80,
1791 req_h => 20, 2256 min_h => $::WIDTH / 80,
1792 vertical => 0, 2257 vertical => 0,
1793 can_hover => 1, 2258 can_hover => 1,
1794 inner_pad => 5, 2259 inner_pad => 0.02,
1795 @_ 2260 @_
1796 ); 2261 );
1797 2262
2263 $self->set_value ($self->{range}[0]);
2264 $self->update;
2265
1798 $self 2266 $self
1799} 2267}
1800 2268
2269sub changed { }
2270
2271sub set_range {
2272 my ($self, $range) = @_;
2273
2274 ($range, $self->{range}) = ($self->{range}, $range);
2275
2276 $self->update
2277 if "@$range" ne "@{$self->{range}}";
2278}
2279
2280sub set_value {
2281 my ($self, $value) = @_;
2282
2283 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2284
2285 $hi = $lo + 1 if $hi <= $lo;
2286
2287 $page = $hi - $lo if $page > $hi - $lo;
2288
2289 $value = $lo if $value < $lo;
2290 $value = $hi - $page if $value > $hi - $page;
2291
2292 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2293 if $unit;
2294
2295 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2296
2297 if ($value != $old_value) {
2298 $self->_emit (changed => $value);
2299 $self->update;
2300 }
2301}
2302
1801sub size_request { 2303sub size_request {
1802 my ($self) = @_; 2304 my ($self) = @_;
1803 2305
1804 my $w = $self->{req_w}; 2306 ($self->{req_w}, $self->{req_h})
1805 my $h = $self->{req_h};
1806
1807 $self->{vertical} ? ($h, $w) : ($w, $h)
1808} 2307}
1809 2308
1810sub button_down { 2309sub button_down {
1811 my ($self, $ev, $x, $y) = @_; 2310 my ($self, $ev, $x, $y) = @_;
1812 2311
1813 $self->SUPER::button_down ($ev, $x, $y); 2312 $self->SUPER::button_down ($ev, $x, $y);
2313
2314 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2315
1814 $self->mouse_motion ($ev, $x, $y); 2316 $self->mouse_motion ($ev, $x, $y)
1815} 2317}
1816 2318
1817sub mouse_motion { 2319sub mouse_motion {
1818 my ($self, $ev, $x, $y) = @_; 2320 my ($self, $ev, $x, $y) = @_;
1819 2321
1820 if ($GRAB == $self) { 2322 if ($GRAB == $self) {
2323 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2324
2325 my (undef, $lo, $hi, $page) = @{$self->{range}};
2326
2327 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2328
2329 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2330 } else {
2331 return 0;
2332 }
2333
2334 1
2335}
2336
2337sub update {
2338 my ($self) = @_;
2339
2340 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2341 $self->set_value ($self->{range}[0]);
2342
1821 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2343 my ($value, $lo, $hi, $page) = @{$self->{range}};
2344 my $range = ($hi - $page - $lo) || 1e-100;
1822 2345
1823 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2346 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1824 2347
1825 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2348 $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 2349 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1827 2350
1828 $x -= $inner_pad_px; # substract the padding 2351 $value = ($value - $lo) / $range;
1829 $x = $x * ($hi - $lo) / $inner_w + $lo; 2352 $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 2353
1834 $self->emit (changed => $x); 2354 $self->{knob_x} = $value - $knob_w * 0.5;
1835 $self->update; 2355 $self->{knob_w} = $knob_w;
1836 } 2356 });
1837}
1838 2357
1839# the inner_* stuff is for generating a padding for the slider handle, 2358 $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} 2359}
1846 2360
1847sub _draw { 2361sub _draw {
1848 my ($self) = @_; 2362 my ($self) = @_;
1849 2363
1850 $self->SUPER::_draw (); 2364 $self->SUPER::_draw ();
1851 2365
1852 my ($w, $h) = @$self{qw(w h)}; 2366 glScale $self->{w}, $self->{h};
1853 2367
1854 if ($self->{vertical}) { 2368 if ($self->{vertical}) {
1855 # draw a vertical slider like a rotated horizontal slider 2369 # draw a vertical slider like a rotated horizontal slider
1856 2370
2371 glTranslate 1, 0, 0;
1857 glRotate 90, 0, 0, 1; 2372 glRotate 90, 0, 0, 1;
1858 glTranslate 0, -$self->{w}, 0;
1859
1860 ($w, $h) = ($h, $w);
1861 } 2373 }
1862 2374
1863 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2375 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1864 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2376 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1865 2377
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; 2378 glEnable GL_TEXTURE_2D;
1887 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2379 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1888 2380
1889 # draw background 2381 # draw background
1890 $tex[1]->draw_quad (0, 0, $w, $h); 2382 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1891 2383
1892 # draw handle 2384 # draw handle
1893 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2385 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
1894 2386
1895 glDisable GL_BLEND;
1896 glDisable GL_TEXTURE_2D; 2387 glDisable GL_TEXTURE_2D;
1897} 2388}
2389
2390#############################################################################
2391
2392package CFClient::UI::ValSlider;
2393
2394our @ISA = CFClient::UI::HBox::;
2395
2396sub new {
2397 my ($class, %arg) = @_;
2398
2399 my $range = delete $arg{range};
2400
2401 my $self = $class->SUPER::new (
2402 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2403 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2404 to_value => sub { shift },
2405 from_value => sub { shift },
2406 %arg,
2407 );
2408
2409 $self->{slider}->connect (changed => sub {
2410 my ($self, $value) = @_;
2411 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2412 $self->{parent}->emit (changed => $value);
2413 });
2414
2415# $self->{entry}->connect (changed => sub {
2416# my ($self, $value) = @_;
2417# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2418# $self->{parent}->emit (changed => $value);
2419# });
2420
2421 $self->add ($self->{slider}, $self->{entry});
2422
2423 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2424
2425 $self
2426}
2427
2428sub set_range { shift->{slider}->set_range (@_) }
2429sub set_value { shift->{slider}->set_value (@_) }
1898 2430
1899############################################################################# 2431#############################################################################
1900 2432
1901package CFClient::UI::TextView; 2433package CFClient::UI::TextView;
1902 2434
… …
1906 2438
1907sub new { 2439sub new {
1908 my $class = shift; 2440 my $class = shift;
1909 2441
1910 my $self = $class->SUPER::new ( 2442 my $self = $class->SUPER::new (
1911 fontsize => 1, 2443 fontsize => 1,
2444 can_events => 0,
2445 #font => default_font
1912 @_, 2446 @_,
1913 2447
1914 layout => (new CFClient::Layout), 2448 layout => (new CFClient::Layout 1),
1915 par => [], 2449 par => [],
1916 height => 0, 2450 height => 0,
1917 children => [ 2451 children => [
1918 (new CFClient::UI::Empty expand => 1), 2452 (new CFClient::UI::Empty expand => 1),
1919 (new CFClient::UI::Slider vertical => 1), 2453 (new CFClient::UI::Slider vertical => 1),
1920 ], 2454 ],
1921 ); 2455 );
1922 2456
1923 $self->{children}[1]->connect (changed => sub { 2457 $self->{children}[1]->connect (changed => sub { $self->update });
1924 $self->update;
1925 });
1926 2458
1927 $self 2459 $self
1928} 2460}
1929 2461
1930sub set_fontsize { 2462sub set_fontsize {
… …
1932 2464
1933 $self->{fontsize} = $fontsize; 2465 $self->{fontsize} = $fontsize;
1934 $self->reflow; 2466 $self->reflow;
1935} 2467}
1936 2468
2469sub size_allocate {
2470 my ($self, $w, $h) = @_;
2471
2472 $self->SUPER::size_allocate ($w, $h);
2473
2474 $self->{layout}->set_font ($self->{font}) if $self->{font};
2475 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2476 $self->{layout}->set_width ($self->{children}[0]{w});
2477
2478 $self->reflow;
2479}
2480
1937sub text_height { 2481sub text_size {
1938 my ($self, $text) = @_; 2482 my ($self, $text, $indent) = @_;
1939 2483
1940 my $layout = $self->{layout}; 2484 my $layout = $self->{layout};
1941 2485
1942 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2486 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1943 $layout->set_width ($self->{w}); 2487 $layout->set_width ($self->{children}[0]{w} - $indent);
1944 $layout->set_text ($text); 2488 $layout->set_markup ($text);
1945 2489
1946 ($layout->size)[1] 2490 $layout->size
1947} 2491}
1948 2492
1949sub reflow { 2493sub reflow {
1950 my ($self) = @_; 2494 my ($self) = @_;
1951 2495
1952 $self->{need_reflow}++; 2496 $self->{need_reflow}++;
1953 $self->update; 2497 $self->update;
1954} 2498}
1955 2499
1956sub size_allocate { 2500sub set_offset {
2501 my ($self, $offset) = @_;
2502
2503 # todo: base offset on lines or so, not on pixels
2504 $self->{children}[1]->set_value ($offset);
2505}
2506
2507sub clear {
1957 my ($self, $w, $h) = @_; 2508 my ($self) = @_;
1958 2509
1959 $self->SUPER::size_allocate ($w, $h); 2510 $self->{par} = [];
1960 2511 $self->{height} = 0;
1961 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2512 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
1962 $self->{layout}->set_width ($self->{children}[0]{w});
1963
1964 $self->reflow;
1965} 2513}
1966 2514
1967sub add_paragraph { 2515sub add_paragraph {
1968 my ($self, $color, $text) = @_; 2516 my ($self, $color, $text, $indent) = @_;
1969 2517
1970 #TODO: intelligently "reformat" paragraph 2518 for my $line (split /\n/, $text) {
1971 2519 my ($w, $h) = $self->text_size ($line);
1972 my $height = $self->text_height ($text);
1973
1974 $self->{height} += $height; 2520 $self->{height} += $h;
2521 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2522 }
1975 2523
1976 push @{$self->{par}}, [$height, $color, $text];
1977
1978 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2524 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
1979 $self->{children}[1]->update;
1980} 2525}
1981 2526
1982sub update { 2527sub update {
1983 my ($self) = @_; 2528 my ($self) = @_;
1984 2529
… …
1986 2531
1987 return unless $self->{h} > 0; 2532 return unless $self->{h} > 0;
1988 2533
1989 delete $self->{texture}; 2534 delete $self->{texture};
1990 2535
1991 $ROOT->on_refresh ($self, sub { 2536 $ROOT->on_post_alloc ($self, sub {
2537 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2538
1992 if (delete $self->{need_reflow}) { 2539 if (delete $self->{need_reflow}) {
1993 my $height = 0; 2540 my $height = 0;
1994 2541
1995 $height += $_->[0] = $self->text_height ($_->[2]) 2542 my $layout = $self->{layout};
2543
2544 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2545
1996 for @{$self->{par}}; 2546 for (@{$self->{par}}) {
2547 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2548 $layout->set_width ($W - $_->[3]);
2549 $layout->set_markup ($_->[4]);
2550 my ($w, $h) = $layout->size;
2551 $_->[0] = $w + $_->[3];
2552 $_->[1] = $h;
2553 }
2554
2555 $height += $_->[1];
2556 }
1997 2557
1998 $self->{height} = $height; 2558 $self->{height} = $height;
1999 2559
2000 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2560 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2001 2561
2002 delete $self->{texture}; 2562 delete $self->{texture};
2003 } 2563 }
2004 2564
2005 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2565 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2006 glClearColor 0, 0, 0, 1; 2566 glClearColor 0.5, 0.5, 0.5, 0;
2007 glClear GL_COLOR_BUFFER_BIT; 2567 glClear GL_COLOR_BUFFER_BIT;
2008 2568
2569 my $top = int $self->{children}[1]{range}[0];
2570
2571 my $y0 = $top;
2572 my $y1 = $top + $H;
2573
2574 my $y = 0;
2575
2576 my $layout = $self->{layout};
2577
2578 $layout->set_font ($self->{font}) if $self->{font};
2579
2009 glEnable GL_BLEND; 2580 glEnable GL_BLEND;
2581 #TODO# not correct in windows where rgba is forced off
2010 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2582 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 2583
2023 for my $par (@{$self->{par}}) { 2584 for my $par (@{$self->{par}}) {
2024 my $h = $par->[0]; 2585 my $h = $par->[1];
2025 2586
2026 if ($y0 < $y + $h && $y < $y1) { 2587 if ($y0 < $y + $h && $y < $y1) {
2588 $layout->set_foreground (@{ $par->[2] });
2589 $layout->set_width ($W - $par->[3]);
2027 $layout->set_text ($par->[2]); 2590 $layout->set_markup ($par->[4]);
2028 2591
2029 glColor @{ $par->[1] }; 2592 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2030 my ($W, $H) = $layout->size; 2593
2031 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2594 glRasterPos $par->[3], $y - $y0;
2595 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2032 } 2596 }
2033 2597
2034 $y += $h; 2598 $y += $h;
2035 } 2599 }
2036 2600
2037 glDisable GL_TEXTURE_2D;
2038 glDisable GL_BLEND; 2601 glDisable GL_BLEND;
2039 }; 2602 };
2040 }); 2603 });
2041} 2604}
2042 2605
2043sub _draw { 2606sub _draw {
2044 my ($self) = @_; 2607 my ($self) = @_;
2045 2608
2046 if ($self->{texture}) {
2047 glEnable GL_TEXTURE_2D; 2609 glEnable GL_TEXTURE_2D;
2048 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2610 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2611 glColor 1, 1, 1, 1;
2049 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2612 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2050 glDisable GL_TEXTURE_2D; 2613 glDisable GL_TEXTURE_2D;
2051 }
2052 2614
2053 $self->{children}[1]->draw; 2615 $self->{children}[1]->draw;
2054 2616
2055} 2617}
2056 2618
… …
2104 2666
2105sub new { 2667sub new {
2106 my $class = shift; 2668 my $class = shift;
2107 2669
2108 my $self = $class->SUPER::new ( 2670 my $self = $class->SUPER::new (
2109 state => 0, 2671 state => 0,
2110 connect_activate => \&toggle_flopper, 2672 on_activate => \&toggle_flopper,
2111 can_events => 1,
2112 @_ 2673 @_
2113 ); 2674 );
2114 2675
2115 if ($self->{state}) {
2116 $self->{state} = 0;
2117 $self->toggle_flopper;
2118 }
2119
2120 $self 2676 $self
2121} 2677}
2122 2678
2123sub toggle_flopper { 2679sub toggle_flopper {
2124 my ($self) = @_; 2680 my ($self) = @_;
2125 2681
2126 # TODO: use animation 2682 $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} 2683}
2138 2684
2139############################################################################# 2685#############################################################################
2140 2686
2141package CFClient::UI::Tooltip; 2687package CFClient::UI::Tooltip;
… …
2151 @_, 2697 @_,
2152 can_events => 0, 2698 can_events => 0,
2153 ) 2699 )
2154} 2700}
2155 2701
2156sub set_text { 2702sub set_tooltip_from {
2157 my ($self, $text) = @_; 2703 my ($self, $widget) = @_;
2158 2704
2159 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2705 my $tooltip = $widget->{tooltip};
2160 $self->{label}->set_text ($text); 2706
2161 $self->add ($self->{label}); 2707 if ($ENV{CFPLUS_DEBUG} & 2) {
2708 $tooltip .= "\n\n" . (ref $widget) . "\n"
2709 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2710 . "req $widget->{req_w} $widget->{req_h}\n"
2711 . "visible $widget->{visible}";
2712 }
2713
2714 $self->add (new CFClient::UI::Label
2715 markup => $tooltip,
2716 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2717 fontsize => 0.8,
2718 fg => [0, 0, 0, 1],
2719 ellipsise => 0,
2720 font => ($widget->{tooltip_font} || $::FONT_PROP),
2721 );
2162} 2722}
2163 2723
2164sub size_request { 2724sub size_request {
2165 my ($self) = @_; 2725 my ($self) = @_;
2166 2726
2167 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2727 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2168 2728
2169 $w = List::Util::min $::WIDTH * 0.2, $w;
2170 $h = List::Util::max $::HEIGHT * 0.2, $h;
2171
2172 ($w + 4, $h + 4) 2729 ($w + 4, $h + 4)
2173} 2730}
2174 2731
2732sub size_allocate {
2733 my ($self, $w, $h) = @_;
2734
2735 $self->SUPER::size_allocate ($w - 4, $h - 4);
2736}
2737
2738sub visibility_change {
2739 my ($self, $visible) = @_;
2740
2741 return unless $visible;
2742
2743 $self->{root}->on_post_alloc ("move_$self" => sub {
2744 my $widget = $self->{owner}
2745 or return;
2746
2747 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2748
2749 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2750 if $x + $self->{w} > $::WIDTH;
2751
2752 $self->move_abs ($x, $y);
2753 });
2754}
2755
2175sub _draw { 2756sub _draw {
2176 my ($self) = @_; 2757 my ($self) = @_;
2177 2758
2178 glPushMatrix;
2179 glTranslate 0.375, 0.375; 2759 glTranslate 0.375, 0.375;
2180 2760
2181 my ($w, $h) = @$self{qw(w h)}; 2761 my ($w, $h) = @$self{qw(w h)};
2182 2762
2183 glColor 1, 0.8, 0.4; 2763 glColor 1, 0.8, 0.4;
… …
2194 glVertex 0 , $h; 2774 glVertex 0 , $h;
2195 glVertex $w, $h; 2775 glVertex $w, $h;
2196 glVertex $w, 0; 2776 glVertex $w, 0;
2197 glEnd; 2777 glEnd;
2198 2778
2199 glPopMatrix; 2779 glTranslate 2 - 0.375, 2 - 0.375;
2200 2780
2201 glTranslate 2, 2;
2202 $self->SUPER::_draw; 2781 $self->SUPER::_draw;
2203} 2782}
2204 2783
2205############################################################################# 2784#############################################################################
2206 2785
2786package CFClient::UI::Face;
2787
2788our @ISA = CFClient::UI::Base::;
2789
2790use CFClient::OpenGL;
2791
2792sub new {
2793 my $class = shift;
2794
2795 my $self = $class->SUPER::new (
2796 aspect => 1,
2797 can_events => 0,
2798 @_,
2799 );
2800
2801 if ($self->{anim} && $self->{animspeed}) {
2802 Scalar::Util::weaken (my $widget = $self);
2803
2804 $self->{timer} = Event->timer (
2805 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2806 hard => 1,
2807 interval => $self->{animspeed},
2808 cb => sub {
2809 ++$widget->{frame};
2810 $widget->update;
2811 },
2812 );
2813 }
2814
2815 $self
2816}
2817
2818sub size_request {
2819 (32, 8)
2820}
2821
2822sub update {
2823 my ($self) = @_;
2824
2825 return unless $self->{visible};
2826
2827 $self->SUPER::update;
2828}
2829
2830sub _draw {
2831 my ($self) = @_;
2832
2833 return unless $::CONN;
2834
2835 my $face;
2836
2837 if ($self->{frame}) {
2838 my $anim = $::CONN->{anim}[$self->{anim}];
2839
2840 $face = $anim->[ $self->{frame} % @$anim ]
2841 if $anim && @$anim;
2842 }
2843
2844 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2845
2846 if ($tex) {
2847 glEnable GL_TEXTURE_2D;
2848 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2849 glColor 1, 1, 1, 1;
2850 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2851 glDisable GL_TEXTURE_2D;
2852 }
2853}
2854
2855sub DESTROY {
2856 my ($self) = @_;
2857
2858 $self->{timer}->cancel
2859 if $self->{timer};
2860
2861 $self->SUPER::DESTROY;
2862}
2863
2864#############################################################################
2865
2866package CFClient::UI::Buttonbar;
2867
2868our @ISA = CFClient::UI::HBox::;
2869
2870# TODO: should actualyl wrap buttons and other goodies.
2871
2872#############################################################################
2873
2874package CFClient::UI::Menu;
2875
2876our @ISA = CFClient::UI::FancyFrame::;
2877
2878use CFClient::OpenGL;
2879
2880sub new {
2881 my $class = shift;
2882
2883 my $self = $class->SUPER::new (
2884 items => [],
2885 z => 100,
2886 @_,
2887 );
2888
2889 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2890
2891 for my $item (@{ $self->{items} }) {
2892 my ($widget, $cb) = @$item;
2893
2894 # handle various types of items, only text for now
2895 if (!ref $widget) {
2896 $widget = new CFClient::UI::Label
2897 can_hover => 1,
2898 can_events => 1,
2899 text => $widget;
2900 }
2901
2902 $self->{item}{$widget} = $item;
2903
2904 $self->{vbox}->add ($widget);
2905 }
2906
2907 $self
2908}
2909
2910# popup given the event (must be a mouse button down event currently)
2911sub popup {
2912 my ($self, $ev) = @_;
2913
2914 $self->_emit ("popdown");
2915
2916 # maybe save $GRAB? must be careful about events...
2917 $GRAB = $self;
2918 $self->{button} = $ev->{button};
2919
2920 $self->show;
2921 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2922}
2923
2924sub mouse_motion {
2925 my ($self, $ev, $x, $y) = @_;
2926
2927 # TODO: should use vbox->find_widget or so
2928 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2929 $self->{hover} = $self->{item}{$HOVER};
2930
2931 0
2932}
2933
2934sub button_up {
2935 my ($self, $ev, $x, $y) = @_;
2936
2937 if ($ev->{button} == $self->{button}) {
2938 undef $GRAB;
2939 $self->hide;
2940
2941 $self->_emit ("popdown");
2942 $self->{hover}[1]->() if $self->{hover};
2943 } else {
2944 return 0
2945 }
2946
2947 1
2948}
2949
2950#############################################################################
2951
2952package CFClient::UI::Multiplexer;
2953
2954our @ISA = CFClient::UI::Container::;
2955
2956sub new {
2957 my $class = shift;
2958
2959 my $self = $class->SUPER::new (
2960 @_,
2961 );
2962
2963 $self->{current} = $self->{children}[0]
2964 if @{ $self->{children} };
2965
2966 $self
2967}
2968
2969sub add {
2970 my ($self, @widgets) = @_;
2971
2972 $self->SUPER::add (@widgets);
2973
2974 $self->{current} = $self->{children}[0]
2975 if @{ $self->{children} };
2976}
2977
2978sub set_current_page {
2979 my ($self, $page_or_widget) = @_;
2980
2981 my $widget = ref $page_or_widget
2982 ? $page_or_widget
2983 : $self->{children}[$page_or_widget];
2984
2985 $self->{current} = $widget;
2986 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2987
2988 $self->_emit (page_changed => $self->{current});
2989
2990 $self->realloc;
2991}
2992
2993sub visible_children {
2994 $_[0]{current}
2995}
2996
2997sub size_request {
2998 my ($self) = @_;
2999
3000 $self->{current}->size_request
3001}
3002
3003sub size_allocate {
3004 my ($self, $w, $h) = @_;
3005
3006 $self->{current}->configure (0, 0, $w, $h);
3007}
3008
3009sub _draw {
3010 my ($self) = @_;
3011
3012 $self->{current}->draw;
3013}
3014
3015#############################################################################
3016
3017package CFClient::UI::Notebook;
3018
3019our @ISA = CFClient::UI::VBox::;
3020
3021sub new {
3022 my $class = shift;
3023
3024 my $self = $class->SUPER::new (
3025 buttonbar => (new CFClient::UI::Buttonbar),
3026 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3027 @_,
3028 );
3029
3030 $self->SUPER::add ($self->{buttonbar}, $self->{multiplexer});
3031
3032 $self
3033}
3034
3035sub add {
3036 my ($self, $title, $widget, $tooltip) = @_;
3037
3038 Scalar::Util::weaken $self;
3039
3040 $self->{buttonbar}->add (new CFClient::UI::Button
3041 markup => $title,
3042 tooltip => $tooltip,
3043 on_activate => sub { $self->set_current_page ($widget) },
3044 );
3045
3046 $self->{multiplexer}->add ($widget);
3047}
3048
3049sub set_current_page {
3050 my ($self, $page) = @_;
3051
3052 $self->{multiplexer}->set_current_page ($page);
3053 $self->_emit (page_changed => $self->{multiplexer}{current});
3054}
3055
3056#############################################################################
3057
3058package CFClient::UI::Statusbox;
3059
3060our @ISA = CFClient::UI::VBox::;
3061
3062sub new {
3063 my $class = shift;
3064
3065 $class->SUPER::new (
3066 fontsize => 0.8,
3067 @_,
3068 )
3069}
3070
3071sub reorder {
3072 my ($self) = @_;
3073 my $NOW = time;
3074
3075 while (my ($k, $v) = each %{ $self->{item} }) {
3076 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3077 }
3078
3079 my @widgets;
3080
3081 my @items = sort {
3082 $a->{pri} <=> $b->{pri}
3083 or $b->{id} <=> $a->{id}
3084 } values %{ $self->{item} };
3085
3086 my $count = 10 + 1;
3087 for my $item (@items) {
3088 last unless --$count;
3089
3090 push @widgets, $item->{label} ||= do {
3091 # TODO: doesn't handle markup well (read as: at all)
3092 my $short = $item->{count} > 1
3093 ? "<b>$item->{count} ×</b> $item->{text}"
3094 : $item->{text};
3095
3096 for ($short) {
3097 s/^\s+//;
3098 s/\s+/ /g;
3099 }
3100
3101 new CFClient::UI::Label
3102 markup => $short,
3103 tooltip => $item->{tooltip},
3104 tooltip_font => $::FONT_PROP,
3105 tooltip_width => 0.67,
3106 fontsize => $item->{fontsize} || $self->{fontsize},
3107 max_w => $::WIDTH * 0.44,
3108 fg => $item->{fg},
3109 can_events => 1,
3110 can_hover => 1
3111 };
3112 }
3113
3114 $self->clear;
3115 $self->SUPER::add (reverse @widgets);
3116}
3117
3118sub add {
3119 my ($self, $text, %arg) = @_;
3120
3121 $text =~ s/^\s+//;
3122 $text =~ s/\s+$//;
3123
3124 return unless $text;
3125
3126 my $timeout = time + ((delete $arg{timeout}) || 60);
3127
3128 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3129
3130 if (my $item = $self->{item}{$group}) {
3131 if ($item->{text} eq $text) {
3132 $item->{count}++;
3133 } else {
3134 $item->{count} = 1;
3135 $item->{text} = $item->{tooltip} = $text;
3136 }
3137 $item->{id} = ++$self->{id};
3138 $item->{timeout} = $timeout;
3139 delete $item->{label};
3140 } else {
3141 $self->{item}{$group} = {
3142 id => ++$self->{id},
3143 text => $text,
3144 timeout => $timeout,
3145 tooltip => $text,
3146 fg => [0.8, 0.8, 0.8, 0.8],
3147 pri => 0,
3148 count => 1,
3149 %arg,
3150 };
3151 }
3152
3153 $self->reorder;
3154}
3155
3156sub reconfigure {
3157 my ($self) = @_;
3158
3159 delete $_->{label}
3160 for values %{ $self->{item} || {} };
3161
3162 $self->reorder;
3163 $self->SUPER::reconfigure;
3164}
3165
3166#############################################################################
3167
3168package CFClient::UI::Inventory;
3169
3170our @ISA = CFClient::UI::ScrolledWindow::;
3171
3172sub new {
3173 my $class = shift;
3174
3175 my $self = $class->SUPER::new (
3176 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3177 @_,
3178 );
3179
3180 $self
3181}
3182
3183sub set_items {
3184 my ($self, $items) = @_;
3185
3186 $self->{scrolled}->clear;
3187 return unless $items;
3188
3189 my @items = sort {
3190 ($a->{type} <=> $b->{type})
3191 or ($a->{name} cmp $b->{name})
3192 } @$items;
3193
3194 $self->{real_items} = \@items;
3195
3196 my $row = 0;
3197 for my $item (@items) {
3198 CFClient::Item::update_widgets $item;
3199
3200 $self->{scrolled}->add (0, $row, $item->{face_widget});
3201 $self->{scrolled}->add (1, $row, $item->{desc_widget});
3202 $self->{scrolled}->add (2, $row, $item->{weight_widget});
3203
3204 $row++;
3205 }
3206}
3207
3208#############################################################################
3209
3210package CFClient::UI::BindEditor;
3211
3212our @ISA = CFClient::UI::FancyFrame::;
3213
3214sub new {
3215 my $class = shift;
3216
3217 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3218
3219 $self->add (my $vb = new CFClient::UI::VBox);
3220
3221
3222 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3223 text => "start recording",
3224 tooltip => "Start/Stops recording of actions."
3225 ."All subsequent actions after the recording started will be captured."
3226 ."The actions are displayed after the record was stopped."
3227 ."To bind the action you have to click on the 'Bind' button",
3228 on_activate => sub {
3229 unless ($self->{recording}) {
3230 $self->start;
3231 } else {
3232 $self->stop;
3233 }
3234 });
3235
3236 $vb->add (new CFClient::UI::Label text => "Actions:");
3237 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3238
3239 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3240 $vb->add (my $hb = new CFClient::UI::HBox);
3241 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3242 $hb->add (new CFClient::UI::Button
3243 text => "bind",
3244 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3245 on_activate => sub {
3246 $self->ask_for_bind;
3247 });
3248
3249 $vb->add (my $hb = new CFClient::UI::HBox);
3250 $hb->add (new CFClient::UI::Button
3251 text => "ok",
3252 expand => 1,
3253 tooltip => "This closes the binding editor and saves the binding",
3254 on_activate => sub {
3255 $self->hide;
3256 $self->commit;
3257 });
3258
3259 $hb->add (new CFClient::UI::Button
3260 text => "cancel",
3261 expand => 1,
3262 tooltip => "This closes the binding editor without saving",
3263 on_activate => sub {
3264 $self->hide;
3265 $self->{binding_cancel}->()
3266 if $self->{binding_cancel};
3267 });
3268
3269 $self->update_binding_widgets;
3270
3271 $self
3272}
3273
3274sub commit {
3275 my ($self) = @_;
3276 my ($mod, $sym, $cmds) = $self->get_binding;
3277 if ($sym != 0 && @$cmds > 0) {
3278 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3279 ."'. Don't forget 'Save Config'!");
3280 $self->{binding_change}->($mod, $sym, $cmds)
3281 if $self->{binding_change};
3282 } else {
3283 $::STATUSBOX->add ("No action bound, no key or action specified!");
3284 $self->{binding_cancel}->()
3285 if $self->{binding_cancel};
3286 }
3287}
3288
3289sub start {
3290 my ($self) = @_;
3291
3292 $self->{rec_btn}->set_text ("stop recording");
3293 $self->{recording} = 1;
3294 $self->clear_command_list;
3295 $::CONN->start_record if $::CONN;
3296}
3297
3298sub stop {
3299 my ($self) = @_;
3300
3301 $self->{rec_btn}->set_text ("start recording");
3302 $self->{recording} = 0;
3303
3304 my $rec;
3305 $rec = $::CONN->stop_record if $::CONN;
3306 return unless ref $rec eq 'ARRAY';
3307 $self->set_command_list ($rec);
3308}
3309
3310
3311sub ask_for_bind_and_commit {
3312 my ($self) = @_;
3313 $self->ask_for_bind (1);
3314}
3315
3316sub ask_for_bind {
3317 my ($self, $commit) = @_;
3318
3319 CFClient::Binder::open_binding_dialog (sub {
3320 my ($mod, $sym) = @_;
3321 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3322 $self->update_binding_widgets;
3323 $self->commit if $commit;
3324 });
3325}
3326
3327# $mod and $sym are the modifiers and key symbol
3328# $cmds is a array ref of strings (the commands)
3329# $cb is the callback that is executed on OK
3330# $ccb is the callback that is executed on CANCEL and
3331# when the binding was unsuccessful on OK
3332sub set_binding {
3333 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3334
3335 $self->clear_command_list;
3336 $self->{recording} = 0;
3337 $self->{rec_btn}->set_text ("start recording");
3338
3339 $self->{binding} = [$mod, $sym];
3340 $self->{commands} = $cmds;
3341
3342 $self->{binding_change} = $cb;
3343 $self->{binding_cancel} = $ccb;
3344
3345 $self->update_binding_widgets;
3346}
3347
3348# this is a shortcut method that asks for a binding
3349# and then just binds it.
3350sub do_quick_binding {
3351 my ($self, $cmds) = @_;
3352 $self->set_binding (undef, undef, $cmds, sub {
3353 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3354 });
3355 $self->ask_for_bind (1);
3356}
3357
3358sub update_binding_widgets {
3359 my ($self) = @_;
3360 my ($mod, $sym, $cmds) = $self->get_binding;
3361 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3362 $self->set_command_list ($cmds);
3363}
3364
3365sub get_binding {
3366 my ($self) = @_;
3367 return (
3368 $self->{binding}->[0],
3369 $self->{binding}->[1],
3370 [ grep { defined $_ } @{$self->{commands}} ]
3371 );
3372}
3373
3374sub clear_command_list {
3375 my ($self) = @_;
3376 $self->{cmdbox}->clear ();
3377}
3378
3379sub set_command_list {
3380 my ($self, $cmds) = @_;
3381
3382 $self->{cmdbox}->clear ();
3383 $self->{commands} = $cmds;
3384
3385 my $idx = 0;
3386
3387 for (@$cmds) {
3388 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3389
3390 my $i = $idx;
3391 $hb->add (new CFClient::UI::Label text => $_);
3392 $hb->add (new CFClient::UI::Button
3393 text => "delete",
3394 tooltip => "Deletes the action from the record",
3395 on_activate => sub {
3396 $self->{cmdbox}->remove ($hb);
3397 $cmds->[$i] = undef;
3398 });
3399
3400
3401 $idx++
3402 }
3403}
3404
3405#############################################################################
3406
3407package CFClient::UI::SpellList;
3408
3409our @ISA = CFClient::UI::ScrolledWindow::;
3410
3411sub new {
3412 my $class = shift;
3413
3414 my $self = $class->SUPER::new (
3415 binding => [],
3416 commands => [],
3417 scrolled => (new CFClient::UI::Table),
3418 @_,
3419 )
3420}
3421
3422# XXX: Do sorting? Argl...
3423sub add_spell {
3424 my ($self, $spell) = @_;
3425 $self->{spells}->{$spell->{name}} = $spell;
3426
3427 $self->{scrolled}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3428 face => $spell->{face},
3429 can_hover => 1,
3430 can_events => 1,
3431 tooltip => $spell->{message});
3432
3433 $self->{scrolled}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3434 text => $spell->{name},
3435 can_hover => 1,
3436 can_events => 1,
3437 tooltip => $spell->{message},
3438 expand => 1);
3439
3440 $self->{scrolled}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3441 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3442 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3443 expand => 1);
3444
3445 $self->{scrolled}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3446 text => "bind to key",
3447 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3448}
3449
3450sub rebuild_spell_list {
3451 my ($self) = @_;
3452 $self->{tbl_idx} = 0;
3453 $self->add_spell ($_) for values %{$self->{spells}};
3454}
3455
3456sub remove_spell {
3457 my ($self, $spell) = @_;
3458 delete $self->{spells}->{$spell->{name}};
3459 $self->rebuild_spell_list;
3460}
3461
3462#############################################################################
3463
2207package CFClient::UI::Root; 3464package CFClient::UI::Root;
2208 3465
2209our @ISA = CFClient::UI::Container::; 3466our @ISA = CFClient::UI::Container::;
2210 3467
2211use CFClient::OpenGL; 3468use CFClient::OpenGL;
2212 3469
2213sub check_size { 3470sub new {
2214 my ($self) = @_; 3471 my $class = shift;
2215 3472
2216 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 3473 my $self = $class->SUPER::new (
3474 visible => 1,
3475 @_,
3476 );
3477
3478 Scalar::Util::weaken ($self->{root} = $self);
3479
3480 $self
2217} 3481}
2218 3482
2219sub size_request { 3483sub size_request {
2220 ($::WIDTH, $::HEIGHT) 3484 my ($self) = @_;
2221}
2222 3485
2223sub configure { 3486 ($self->{w}, $self->{h})
3487}
3488
3489sub _to_pixel {
3490 my ($coord, $size, $max) = @_;
3491
3492 $coord =
3493 $coord eq "center" ? ($max - $size) * 0.5
3494 : $coord eq "max" ? $max
3495 : $coord;
3496
3497 $coord = 0 if $coord < 0;
3498 $coord = $max - $size if $coord > $max - $size;
3499
3500 int $coord + 0.5
3501}
3502
3503sub size_allocate {
2224 my ($self, $x, $y, $w, $h) = @_; 3504 my ($self, $w, $h) = @_;
2225 3505
2226 $self->SUPER::configure ($x, $y, $w, $h);
2227
2228 for my $child (@{$self->{children}}) { 3506 for my $child ($self->children) {
2229 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3507 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2230 3508
2231 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3509 $X = $child->{force_x} if exists $child->{force_x};
2232 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3510 $Y = $child->{force_y} if exists $child->{force_y};
3511
3512 $X = _to_pixel $X, $W, $self->{w};
3513 $Y = _to_pixel $Y, $H, $self->{h};
3514
2233 $child->configure ($X, $Y, $W,$H); 3515 $child->configure ($X, $Y, $W, $H);
2234 } 3516 }
2235} 3517}
2236 3518
2237sub _topleft { 3519sub coord2local {
2238 my ($self, $x, $y) = @_; 3520 my ($self, $x, $y) = @_;
2239 3521
2240 ($x, $y) 3522 ($x, $y)
2241} 3523}
2242 3524
3525sub coord2global {
3526 my ($self, $x, $y) = @_;
3527
3528 ($x, $y)
3529}
3530
2243sub update { 3531sub update {
2244 my ($self) = @_; 3532 my ($self) = @_;
2245 3533
2246 $self->check_size; 3534 $::WANT_REFRESH++;
2247 ::refresh ();
2248} 3535}
2249 3536
2250sub add { 3537sub add {
2251 my ($self, $child) = @_; 3538 my ($self, @children) = @_;
2252 3539
2253 # integerize window positions 3540 $_->{is_toplevel} = 1
2254 $child->{x} = int $child->{x}; 3541 for @children;
2255 $child->{y} = int $child->{y};
2256 3542
2257 $self->SUPER::add ($child); 3543 $self->SUPER::add (@children);
3544}
3545
3546sub remove {
3547 my ($self, @children) = @_;
3548
3549 $self->SUPER::remove (@children);
3550
3551 delete $self->{is_toplevel}
3552 for @children;
3553
3554 while (@children) {
3555 my $w = pop @children;
3556 push @children, $w->children;
3557 $w->set_invisible;
3558 }
2258} 3559}
2259 3560
2260sub on_refresh { 3561sub on_refresh {
2261 my ($self, $id, $cb) = @_; 3562 my ($self, $id, $cb) = @_;
2262 3563
2263 $self->{refresh_hook}{$id} = $cb; 3564 $self->{refresh_hook}{$id} = $cb;
2264} 3565}
2265 3566
3567sub on_post_alloc {
3568 my ($self, $id, $cb) = @_;
3569
3570 $self->{post_alloc_hook}{$id} = $cb;
3571}
3572
2266sub draw { 3573sub draw {
2267 my ($self) = @_; 3574 my ($self) = @_;
2268 3575
2269 while (my $rcb = delete $self->{refresh_hook}) { 3576 while ($self->{refresh_hook}) {
2270 $_->() for values %$rcb; 3577 $_->()
3578 for values %{delete $self->{refresh_hook}};
2271 } 3579 }
3580
3581 if ($self->{realloc}) {
3582 my %queue;
3583 my @queue;
3584 my $widget;
3585
3586 outer:
3587 while () {
3588 if (my $realloc = delete $self->{realloc}) {
3589 for $widget (values %$realloc) {
3590 $widget->{visible} or next; # do not resize invisible widgets
3591
3592 $queue{$widget+0}++ and next; # duplicates are common
3593
3594 push @{ $queue[$widget->{visible}] }, $widget;
3595 }
3596 }
3597
3598 while () {
3599 @queue or last outer;
3600
3601 $widget = pop @{ $queue[-1] || [] }
3602 and last;
3603
3604 pop @queue;
3605 }
3606
3607 delete $queue{$widget+0};
3608
3609 my ($w, $h) = $widget->size_request;
3610
3611 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3612 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3613
3614 $w = $widget->{force_w} if exists $widget->{force_w};
3615 $h = $widget->{force_h} if exists $widget->{force_h};
3616
3617 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3618 || delete $widget->{force_realloc}) {
3619 $widget->{req_w} = $w;
3620 $widget->{req_h} = $h;
3621
3622 $self->{size_alloc}{$widget+0} = $widget;
3623
3624 if (my $parent = $widget->{parent}) {
3625 $self->{realloc}{$parent+0} = $parent
3626 unless $queue{$parent+0};
3627
3628 $parent->{force_size_alloc} = 1;
3629 $self->{size_alloc}{$parent+0} = $parent;
3630 }
3631 }
3632
3633 delete $self->{realloc}{$widget+0};
3634 }
3635 }
3636
3637 while (my $size_alloc = delete $self->{size_alloc}) {
3638 my @queue = sort { $b->{visible} <=> $a->{visible} }
3639 values %$size_alloc;
3640
3641 while () {
3642 my $widget = pop @queue || last;
3643
3644 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3645
3646 $w = 0 if $w < 0;
3647 $h = 0 if $h < 0;
3648
3649 $w = int $w + 0.5;
3650 $h = int $h + 0.5;
3651
3652 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3653 $widget->{old_w} = $widget->{w};
3654 $widget->{old_h} = $widget->{h};
3655
3656 $widget->{w} = $w;
3657 $widget->{h} = $h;
3658
3659 $widget->emit (size_allocate => $w, $h);
3660 }
3661 }
3662 }
3663
3664 while ($self->{post_alloc_hook}) {
3665 $_->()
3666 for values %{delete $self->{post_alloc_hook}};
3667 }
3668
2272 3669
2273 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3670 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2274 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3671 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2275 glClear GL_COLOR_BUFFER_BIT; 3672 glClear GL_COLOR_BUFFER_BIT;
2276 3673
2277 glMatrixMode GL_PROJECTION; 3674 glMatrixMode GL_PROJECTION;
2278 glLoadIdentity; 3675 glLoadIdentity;
2279 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3676 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2280 glMatrixMode GL_MODELVIEW; 3677 glMatrixMode GL_MODELVIEW;
2281 glLoadIdentity; 3678 glLoadIdentity;
2282 3679
3680 {
3681 package CFClient::UI::Base;
3682
3683 ($draw_x, $draw_y, $draw_w, $draw_h) =
3684 (0, 0, $self->{w}, $self->{h});
3685 }
3686
2283 $self->_draw; 3687 $self->_draw;
2284} 3688}
2285 3689
2286############################################################################# 3690#############################################################################
2287 3691
2288package CFClient::UI; 3692package CFClient::UI;
2289 3693
2290$ROOT = new CFClient::UI::Root; 3694$ROOT = new CFClient::UI::Root;
2291$TOOLTIP = new CFClient::UI::Tooltip; 3695$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2292 3696
22931 36971
2294 3698

Diff Legend

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