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.157 by root, Sun Apr 23 21:47:32 2006 UTC vs.
Revision 1.273 by root, Sat Jun 3 02:32:35 2006 UTC

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

Diff Legend

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