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

Diff Legend

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