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.146 by elmex, Fri Apr 21 15:03:46 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;
16our $TOOLTIP;
13our $BUTTON_STATE; 17our $BUTTON_STATE;
18
19our %WIDGET; # all widgets, weak-referenced
20
21sub get_layout {
22 my $layout;
23
24 for (grep { $_->{name} } values %WIDGET) {
25 my $win = $layout->{$_->{name}} = { };
26
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
31
32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
36}
37
38sub set_layout {
39 my ($layout) = @_;
40
41 $LAYOUT = $layout;
42}
43
44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
47 if (!$GRAB) {
48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
49 if (length $widget->{tooltip}) {
50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
53 $TOOLTIP->{owner} = $widget;
54
55 my $tip = $widget->{tooltip};
56
57 $tip = $tip->($widget) if CODE:: eq ref $tip;
58
59 $TOOLTIP->set_tooltip_from ($widget);
60 $TOOLTIP->show;
61 }
62
63 return;
64 }
65 }
66 }
67
68 $TOOLTIP->hide;
69 delete $TOOLTIP->{owner};
70}
14 71
15# class methods for events 72# class methods for events
16sub feed_sdl_key_down_event { 73sub feed_sdl_key_down_event {
17 $FOCUS->key_down ($_[0]) if $FOCUS; 74 $FOCUS->emit (key_down => $_[0])
75 if $FOCUS;
18} 76}
19 77
20sub feed_sdl_key_up_event { 78sub feed_sdl_key_up_event {
21 $FOCUS->key_up ($_[0]) if $FOCUS; 79 $FOCUS->emit (key_up => $_[0])
80 if $FOCUS;
22} 81}
23 82
24sub feed_sdl_button_down_event { 83sub feed_sdl_button_down_event {
25 my ($ev) = @_; 84 my ($ev) = @_;
26 my ($x, $y) = ($ev->{x}, $ev->{y}); 85 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
28 if (!$BUTTON_STATE) { 87 if (!$BUTTON_STATE) {
29 my $widget = $ROOT->find_widget ($x, $y); 88 my $widget = $ROOT->find_widget ($x, $y);
30 89
31 $GRAB = $widget; 90 $GRAB = $widget;
32 $GRAB->update if $GRAB; 91 $GRAB->update if $GRAB;
92
93 check_tooltip;
33 } 94 }
34 95
35 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 96 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
36 97
37 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
99 if $GRAB;
38} 100}
39 101
40sub feed_sdl_button_up_event { 102sub feed_sdl_button_up_event {
41 my ($ev) = @_; 103 my ($ev) = @_;
42 my ($x, $y) = ($ev->{x}, $ev->{y}); 104 my ($x, $y) = ($ev->{x}, $ev->{y});
43 105
44 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 106 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
45 107
46 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
47 109
48 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
111 if $GRAB;
49 112
50 if (!$BUTTON_STATE) { 113 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB; 114 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab; 115 $grab->update if $grab;
53 $GRAB->update if $GRAB; 116 $GRAB->update if $GRAB;
117
118 check_tooltip;
54 } 119 }
55} 120}
56 121
57sub feed_sdl_motion_event { 122sub feed_sdl_motion_event {
58 my ($ev) = @_; 123 my ($ev) = @_;
… …
63 if ($widget != $HOVER) { 128 if ($widget != $HOVER) {
64 my $hover = $HOVER; $HOVER = $widget; 129 my $hover = $HOVER; $HOVER = $widget;
65 130
66 $hover->update if $hover && $hover->{can_hover}; 131 $hover->update if $hover && $hover->{can_hover};
67 $HOVER->update if $HOVER && $HOVER->{can_hover}; 132 $HOVER->update if $HOVER && $HOVER->{can_hover};
68 }
69 133
134 check_tooltip;
135 }
136
70 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
138 if $HOVER;
71} 139}
72 140
73# convert position array to integers 141# convert position array to integers
74sub harmonize { 142sub harmonize {
75 my ($vals) = @_; 143 my ($vals) = @_;
… …
81 $rem += $_ - $i; 149 $rem += $_ - $i;
82 $_ = $i; 150 $_ = $i;
83 } 151 }
84} 152}
85 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
86############################################################################# 195#############################################################################
87 196
88package CFClient::UI::Base; 197package CFClient::UI::Base;
89 198
90use strict; 199use strict;
… …
93 202
94sub new { 203sub new {
95 my $class = shift; 204 my $class = shift;
96 205
97 my $self = bless { 206 my $self = bless {
98 x => 0, 207 x => "center",
99 y => 0, 208 y => "center",
100 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
212 can_events => 1,
101 @_ 213 @_
102 }, $class; 214 }, $class;
103 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
104 for (keys %$self) { 218 for (keys %$self) {
105 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
106 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
107 } 221 }
108 } 222 }
109 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
110 $self 236 $self
111} 237}
112 238
239sub destroy {
240 my ($self) = @_;
241
242 $self->hide;
243 %$self = ();
244}
245
113sub show { 246sub show {
114 my ($self) = @_; 247 my ($self) = @_;
115 248
116 return if $self->{parent}; 249 return if $self->{parent};
117 250
118 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
119} 252}
120 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
121sub hide { 307sub hide {
122 my ($self) = @_; 308 my ($self) = @_;
123 309
124 return unless $self->{parent}; 310 $self->set_invisible;
125 311
126 $self->{parent}->remove ($self); 312 $self->{parent}->remove ($self)
313 if $self->{parent};
127} 314}
128 315
129sub move { 316sub move_abs {
130 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
131 318
132 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
133 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
134 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
135 322
136 $self->update; 323 $self->update;
137} 324}
138 325
139sub needs_redraw { 326sub set_size {
140 0 327 my ($self, $w, $h) = @_;
328
329 $self->{force_w} = $w;
330 $self->{force_h} = $h;
331
332 $self->realloc;
141} 333}
142 334
143sub size_request { 335sub size_request {
144 require Carp; 336 require Carp;
145 Carp::confess "size_request is abtract"; 337 Carp::confess "size_request is abstract";
146} 338}
147 339
148sub configure { 340sub configure {
149 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
150 342
151 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
152 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
153 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
154 348
155 # use alignment to adjust x, y 349 # use alignment to adjust x, y
156 350
157 $x += ($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
158 $y += ($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
159
160 ($w, $h) = ($w2, $h2);
161 } 353 }
162 354
163 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
164 $self->{x} = $x; 356 $self->{x} = $x;
165 $self->{y} = $y; 357 $self->{y} = $y;
166 $self->update; 358 $self->update;
167 } 359 }
168 360
169 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
362 return unless $self->{visible};
363
170 $self->{w} = $w; 364 $self->{alloc_w} = $w;
171 $self->{h} = $h; 365 $self->{alloc_h} = $h;
172 366
173 $self->size_allocate ($w, $h); 367 $self->{root}{size_alloc}{$self+0} = $self;
174 $self->update;
175 } 368 }
176} 369}
177 370
178sub size_allocate { 371sub size_allocate {
179 # nothing to be done 372 # nothing to be done
180} 373}
181 374
182# return top left coordinates 375sub children {
183sub _topleft { 376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
381}
382
383sub set_max_size {
184 my ($self, $x, $y) = @_; 384 my ($self, $w, $h) = @_;
185 385
186 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 386 delete $self->{max_w}; $self->{max_w} = $w if $w;
387 delete $self->{max_h}; $self->{max_h} = $h if $h;
388}
389
390sub set_tooltip {
391 my ($self, $tooltip) = @_;
392
393 $tooltip =~ s/^\s+//;
394 $tooltip =~ s/\s+$//;
395
396 return if $self->{tooltip} eq $tooltip;
397
398 $self->{tooltip} = $tooltip;
399
400 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
401 delete $CFClient::UI::TOOLTIP->{owner};
402 CFClient::UI::check_tooltip;
403 }
187} 404}
188 405
189# translate global coordinates to local coordinate system 406# translate global coordinates to local coordinate system
190sub coord2local { 407sub coord2local {
191 my ($self, $x, $y) = @_; 408 my ($self, $x, $y) = @_;
192 409
193 my ($X, $Y) = $self->_topleft; 410 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
194 ($x - $X, $y - $Y)
195} 411}
196 412
197# translate local coordinates to global coordinate system 413# translate local coordinates to global coordinate system
198sub coord2global { 414sub coord2global {
199 my ($self, $x, $y) = @_; 415 my ($self, $x, $y) = @_;
200 416
201 my ($X, $Y) = $self->_topleft; 417 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
202 ($x + $X, $y + $Y)
203} 418}
204 419
205sub focus_in { 420sub focus_in {
206 my ($self) = @_; 421 my ($self) = @_;
207 422
208 return if $FOCUS == $self; 423 return if $FOCUS == $self;
209 return unless $self->{can_focus}; 424 return unless $self->{can_focus};
210 425
211 my $focus = $FOCUS; $FOCUS = $self; 426 my $focus = $FOCUS; $FOCUS = $self;
212 427
213 $self->emit (focus_in => $focus); 428 $self->_emit (focus_in => $focus);
214 429
215 $focus->update if $focus; 430 $focus->update if $focus;
216 $FOCUS->update; 431 $FOCUS->update;
217} 432}
218 433
… …
221 436
222 return unless $FOCUS == $self; 437 return unless $FOCUS == $self;
223 438
224 my $focus = $FOCUS; undef $FOCUS; 439 my $focus = $FOCUS; undef $FOCUS;
225 440
226 $self->emit (focus_out => $focus); 441 $self->_emit (focus_out => $focus);
227 442
228 $focus->update if $focus; #? 443 $focus->update if $focus; #?
229}
230 444
445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
446 unless $FOCUS;
447}
448
231sub mouse_motion { } 449sub mouse_motion { 0 }
232sub button_up { } 450sub button_up { 0 }
233sub key_down { } 451sub key_down { 0 }
234sub key_up { } 452sub key_up { 0 }
235 453
236sub button_down { 454sub button_down {
237 my ($self, $ev, $x, $y) = @_; 455 my ($self, $ev, $x, $y) = @_;
238 456
239 $self->focus_in; 457 $self->focus_in;
240}
241 458
242sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 459 0
243sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 460}
244sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 461
245sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 462sub find_widget {
246sub 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
247 535
248sub draw { 536sub draw {
249 my ($self) = @_; 537 my ($self) = @_;
250 538
251 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);
252 550
253 glPushMatrix; 551 glPushMatrix;
254 glTranslate $self->{x}, $self->{y}, 0; 552 glTranslate $self->{x}, $self->{y}, 0;
255 $self->_draw; 553 $self->_draw;
256 glPopMatrix; 554 glPopMatrix;
… …
267 glVertex $x + $self->{w}, $y + $self->{h}; 565 glVertex $x + $self->{w}, $y + $self->{h};
268 glVertex $x , $y + $self->{h}; 566 glVertex $x , $y + $self->{h};
269 glEnd; 567 glEnd;
270 glDisable GL_BLEND; 568 glDisable GL_BLEND;
271 } 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 }
272} 584}
273 585
274sub _draw { 586sub _draw {
275 my ($self) = @_; 587 my ($self) = @_;
276 588
277 warn "no draw defined for $self\n"; 589 warn "no draw defined for $self\n";
590}
591
592sub DESTROY {
593 my ($self) = @_;
594
595 delete $WIDGET{$self+0};
596 #$self->deactivate;
597}
598
599#############################################################################
600
601package CFClient::UI::DrawBG;
602
603our @ISA = CFClient::UI::Base::;
604
605use strict;
606use CFClient::OpenGL;
607
608sub new {
609 my $class = shift;
610
611 # range [value, low, high, page]
612
613 $class->SUPER::new (
614 #bg => [0, 0, 0, 0.2],
615 #active_bg => [1, 1, 1, 0.5],
616 @_
617 )
618}
619
620sub _draw {
621 my ($self) = @_;
622
623 my $color = $FOCUS == $self && $self->{active_bg}
624 ? $self->{active_bg}
625 : $self->{bg};
626
627 if ($color && (@$color < 4 || $color->[3])) {
628 my ($w, $h) = @$self{qw(w h)};
629
630 glEnable GL_BLEND;
631 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
632 glColor @$color;
633
634 glBegin GL_QUADS;
635 glVertex 0 , 0;
636 glVertex 0 , $h;
637 glVertex $w, $h;
638 glVertex $w, 0;
639 glEnd;
640
641 glDisable GL_BLEND;
642 }
643}
644
645#############################################################################
646
647package CFClient::UI::Empty;
648
649our @ISA = CFClient::UI::Base::;
650
651sub new {
652 my ($class, %arg) = @_;
653 $class->SUPER::new (can_events => 0, %arg);
654}
655
656sub size_request {
657 my ($self) = @_;
658
659 ($self->{w} + 0, $self->{h} + 0)
660}
661
662sub draw { }
663
664#############################################################################
665
666package CFClient::UI::Container;
667
668our @ISA = CFClient::UI::Base::;
669
670sub new {
671 my ($class, %arg) = @_;
672
673 my $children = delete $arg{children};
674
675 my $self = $class->SUPER::new (
676 children => [],
677 can_events => 0,
678 %arg,
679 );
680
681 $self->add (@$children)
682 if $children;
683
684 $self
685}
686
687sub add {
688 my ($self, @widgets) = @_;
689
690 $_->set_parent ($self)
691 for @widgets;
692
693 use sort 'stable';
694
695 $self->{children} = [
696 sort { $a->{z} <=> $b->{z} }
697 @{$self->{children}}, @widgets
698 ];
699
700 $self->realloc;
701}
702
703sub children {
704 @{ $_[0]{children} }
705}
706
707sub remove {
708 my ($self, $child) = @_;
709
710 delete $child->{parent};
711 $child->hide;
712
713 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
714
715 $self->realloc;
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;
278} 730}
279 731
280sub find_widget { 732sub find_widget {
281 my ($self, $x, $y) = @_; 733 my ($self, $x, $y) = @_;
282 734
283 return $self
284 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
285 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
286
287 ()
288}
289
290sub set_parent {
291 my ($self, $parent) = @_;
292
293 Scalar::Util::weaken ($self->{parent} = $parent);
294}
295
296sub check_size {
297 my ($self) = @_;
298
299 my ($w, $h) = $self->size_request;
300
301 if ($w != $self->{req_w} || $h != $self->{req_h}) {
302 $self->{req_w} = $w;
303 $self->{req_h} = $h;
304
305 $self->{parent}->check_size
306 if $self->{parent};
307 }
308}
309
310sub update {
311 my ($self) = @_;
312
313 $self->{parent}->update
314 if $self->{parent};
315}
316
317sub connect {
318 my ($self, $signal, $cb) = @_;
319
320 push @{ $self->{signal_cb}{$signal} }, $cb;
321}
322
323sub emit {
324 my ($self, $signal, @args) = @_;
325
326 for my $cb (@{$self->{signal_cb}{$signal} || []}) {
327 $cb->($self, @args);
328 }
329}
330
331sub DESTROY {
332 my ($self) = @_;
333
334 #$self->deactivate;
335}
336
337#############################################################################
338
339package CFClient::UI::DrawBG;
340
341our @ISA = CFClient::UI::Base::;
342
343use strict;
344use CFClient::OpenGL;
345
346sub new {
347 my $class = shift;
348
349 # range [value, low, high, page]
350
351 $class->SUPER::new (
352 bg => [0, 0, 0, 0.2],
353 active_bg => [1, 1, 1, 0.5],
354 @_
355 )
356}
357
358sub _draw {
359 my ($self) = @_;
360
361 my ($w, $h) = @$self{qw(w h)};
362
363 glEnable GL_BLEND;
364 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
365 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };
366
367 glBegin GL_QUADS;
368 glVertex 0 , 0;
369 glVertex 0 , $h;
370 glVertex $w, $h;
371 glVertex $w, 0;
372 glEnd;
373
374 glDisable GL_BLEND;
375}
376
377#############################################################################
378
379package CFClient::UI::Empty;
380
381our @ISA = CFClient::UI::Base::;
382
383sub size_request {
384 (0, 0)
385}
386
387sub draw { }
388
389#############################################################################
390
391package CFClient::UI::Container;
392
393our @ISA = CFClient::UI::Base::;
394
395sub new {
396 my ($class, %arg) = @_;
397
398 my $children = delete $arg{children} || [];
399
400 my $self = $class->SUPER::new (children => [], %arg);
401 $self->add ($_) for @$children;
402
403 $self
404}
405
406sub add {
407 my ($self, $child) = @_;
408
409 $child->set_parent ($self);
410
411 use sort 'stable';
412
413 $self->{children} = [
414 sort { $a->{z} <=> $b->{z} }
415 @{$self->{children}}, $child
416 ];
417
418 $child->check_size;
419}
420
421sub remove {
422 my ($self, $child) = @_;
423
424 delete $child->{parent};
425
426 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
427
428 $self->check_size;
429}
430
431sub find_widget {
432 my ($self, $x, $y) = @_;
433
434 $x -= $self->{x}; 735 $x -= $self->{x};
435 $y -= $self->{y}; 736 $y -= $self->{y};
436 737
437 my $res; 738 my $res;
438 739
439 for (reverse @{ $self->{children} }) { 740 for (reverse $self->visible_children) {
440 $res = $_->find_widget ($x, $y) 741 $res = $_->find_widget ($x, $y)
441 and return $res; 742 and return $res;
442 } 743 }
443 744
444 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 745 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
508} 809}
509 810
510sub update { 811sub update {
511 my ($self) = @_; 812 my ($self) = @_;
512 813
513 # we want to do this delayed... 814 $ROOT->on_post_alloc ($self => sub { $self->render_child });
514 $self->render_chld;
515 $self->SUPER::update; 815 $self->SUPER::update;
516}
517
518sub render_chld {
519 my ($self) = @_;
520
521 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
522 glClearColor 0, 0, 0, 1;
523 glClear GL_COLOR_BUFFER_BIT;
524 $self->child->draw;
525 };
526} 816}
527 817
528sub size_allocate { 818sub size_allocate {
529 my ($self, $w, $h) = @_; 819 my ($self, $w, $h) = @_;
530 820
531 $self->child->configure (0, 0, $w, $h); 821 $self->SUPER::size_allocate ($w, $h);
822 $self->update;
823}
532 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
533 $self->render_chld; 845 $self->_render;
846 };
534} 847}
535 848
536sub _draw { 849sub _draw {
537 my ($self) = @_; 850 my ($self) = @_;
538 851
539 my ($w, $h) = ($self->w, $self->h); 852 my ($w, $h) = @$self{qw(w h)};
540 853
541 my $tex = $self->{texture} 854 my $tex = $self->{texture}
542 or return; 855 or return;
543 856
544 glEnable GL_BLEND;
545 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
546 glEnable GL_TEXTURE_2D; 857 glEnable GL_TEXTURE_2D;
547 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;
548 860
549 $tex->draw_quad (0, 0, $w, $h); 861 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
550 862
551 glDisable GL_BLEND;
552 glDisable GL_TEXTURE_2D; 863 glDisable GL_TEXTURE_2D;
553} 864}
554 865
555############################################################################# 866#############################################################################
556 867
557package CFClient::UI::ViewPort; 868package CFClient::UI::ViewPort;
558 869
559our @ISA = CFClient::UI::Window::; 870our @ISA = CFClient::UI::Window::;
560
561sub new { die }
562
563sub size_request {
564 my ($self) = @_;
565
566 @$self{qw(child_w child_h)} = $self->child->size_request;
567 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
568
569 @$self{qw(child_w child_h)}
570}
571
572sub _draw {
573 my ($self) = @_;
574
575 $self->{children}[1]->draw;
576}
577
578
579#############################################################################
580
581package CFClient::UI::Frame;
582
583our @ISA = CFClient::UI::Bin::;
584
585use CFClient::OpenGL;
586
587sub size_request {
588 my ($self) = @_;
589 my $chld = $self->child
590 or return (0, 0);
591
592 $chld->move (2, 2);
593
594 map { $_ + 4 } $chld->size_request;
595}
596
597sub size_allocate {
598 my ($self, $x, $y, $w, $h) = @_;
599
600 $self->child->configure (2, 2, $w - 4, $h - 4);
601}
602
603sub _draw {
604 my ($self) = @_;
605
606 my $chld = $self->child;
607
608 my ($w, $h) = $chld->size_request;
609
610 glBegin GL_QUADS;
611 glColor 0, 0, 0;
612 glVertex 0 , 0;
613 glVertex 0 , $h + 4;
614 glVertex $w + 4 , $h + 4;
615 glVertex $w + 4 , 0;
616 glEnd;
617
618 $chld->draw;
619}
620
621#############################################################################
622
623package CFClient::UI::FancyFrame;
624
625our @ISA = CFClient::UI::Bin::;
626
627use CFClient::OpenGL;
628
629my @tex =
630 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
631 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
632 871
633sub new { 872sub new {
634 my $class = shift; 873 my $class = shift;
635 874
636 # TODO: user_x, user_y, overwrite moveto? 875 $class->SUPER::new (
876 scroll_x => 0,
877 scroll_y => 1,
878 @_,
879 )
880}
881
882sub size_request {
883 my ($self) = @_;
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)
891}
892
893sub size_allocate {
894 my ($self, $w, $h) = @_;
895
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
901 $self->child->configure (0, 0, $w, $h);
902 $self->update;
903}
904
905sub set_offset {
906 my ($self, $x, $y) = @_;
907
908 $self->{view_x} = int $x;
909 $self->{view_y} = int $y;
910
911 $self->update;
912}
913
914# hmm, this does not work for topleft of $self... but we should not ask for that
915sub coord2local {
916 my ($self, $x, $y) = @_;
917
918 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
919}
920
921sub coord2global {
922 my ($self, $x, $y) = @_;
923
924 $x = List::Util::min $self->{w}, $x - $self->{view_x};
925 $y = List::Util::min $self->{h}, $y - $self->{view_y};
926
927 $self->SUPER::coord2global ($x, $y)
928}
929
930sub find_widget {
931 my ($self, $x, $y) = @_;
932
933 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
934 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
935 ) {
936 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
937 } else {
938 $self->CFClient::UI::Base::find_widget ($x, $y)
939 }
940}
941
942sub _render {
943 my ($self) = @_;
944
945 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
946 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
947
948 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
949
950 $self->SUPER::_render;
951}
952
953#############################################################################
954
955package CFClient::UI::ScrolledWindow;
956
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
1016package CFClient::UI::Frame;
1017
1018our @ISA = CFClient::UI::Bin::;
1019
1020use CFClient::OpenGL;
1021
1022sub new {
1023 my $class = shift;
1024
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};
637 1074
638 my $self = $class->SUPER::new ( 1075 my $self = $class->SUPER::new (
639 bg => [1, 1, 1, 1], 1076 bg => [1, 1, 1, 1],
640 border_bg => [1, 1, 1, 1], 1077 border_bg => [1, 1, 1, 1],
641 border => 0.8, 1078 border => 0.6,
642 @_ 1079 can_events => 1,
1080 min_w => 16,
1081 min_h => 16,
1082 %arg,
643 ); 1083 );
644 1084
645 $self->{title} &&= new CFClient::UI::Label 1085 $self->{title} = new CFClient::UI::Label
646 align => 0, 1086 align => 0,
647 valign => 1, 1087 valign => 1,
648 text => $self->{title}, 1088 text => $title,
649 fontsize => 1; 1089 fontsize => $self->{border}
1090 if defined $title;
650 1091
651 $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};
652} 1100}
653 1101
654sub border { 1102sub border {
655 int $_[0]{border} * $::FONTSIZE 1103 int $_[0]{border} * $::FONTSIZE
656} 1104}
657 1105
658sub size_request { 1106sub size_request {
659 my ($self) = @_; 1107 my ($self) = @_;
660 1108
661 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h}; 1109 $self->{title}->size_request
1110 if $self->{title};
662 1111
663 my ($w, $h) = $self->SUPER::size_request; 1112 my ($w, $h) = $self->SUPER::size_request;
664 1113
665 ( 1114 (
666 $w + $self->border * 2, 1115 $w + $self->border * 2,
… …
669} 1118}
670 1119
671sub size_allocate { 1120sub size_allocate {
672 my ($self, $w, $h) = @_; 1121 my ($self, $w, $h) = @_;
673 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
674 $h -= List::Util::max 0, $self->border * 2; 1131 $h -= List::Util::max 0, $border * 2;
675 $w -= List::Util::max 0, $self->border * 2; 1132 $w -= List::Util::max 0, $border * 2;
676 1133
677 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
678 if $self->{title};
679
680 $self->child->configure ($self->border, $self->border, $w, $h); 1134 $self->child->configure ($border, $border, $w, $h);
681} 1135}
682 1136
683sub button_down { 1137sub button_down {
684 my ($self, $ev, $x, $y) = @_; 1138 my ($self, $ev, $x, $y) = @_;
685 1139
1140 my ($w, $h) = @$self{qw(w h)};
686 my $border = $self->border; 1141 my $border = $self->border;
687 1142
688 if ($x < $self->{w} && $x >= $self->{w} - $border 1143 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
689 && $y < $self->{h} && $y >= $self->{h} - $border) { 1144 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
690 1145
1146 if ($lr & $td) {
1147 my ($wx, $wy) = ($self->{x}, $self->{y});
691 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1148 my ($ox, $oy) = ($ev->{x}, $ev->{y});
692 my ($bw, $bh) = ($self->{w}, $self->{h}); 1149 my ($bw, $bh) = ($self->{w}, $self->{h});
693 1150
1151 my $mx = $x < $border;
1152 my $my = $y < $border;
1153
694 $self->{motion} = sub { 1154 $self->{motion} = sub {
695 my ($ev, $x, $y) = @_; 1155 my ($ev, $x, $y) = @_;
696 1156
697 ($x, $y) = ($ev->{x}, $ev->{y}); 1157 my $dx = $ev->{x} - $ox;
1158 my $dy = $ev->{y} - $oy;
698 1159
699 $self->{user_w} = $bw + $x - $ox; 1160 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
700 $self->{user_h} = $bh + $y - $oy; 1161 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
701 $self->check_size; 1162
1163 $self->realloc;
1164 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
702 }; 1165 };
703 1166
704 } elsif ($x >= 0 && $x < $self->{w} 1167 } elsif ($lr ^ $td) {
705 && $y >= 0 && $y < $border) {
706
707 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1168 my ($ox, $oy) = ($ev->{x}, $ev->{y});
708 my ($bx, $by) = ($self->{x}, $self->{y}); 1169 my ($bx, $by) = ($self->{x}, $self->{y});
709 1170
710 $self->{motion} = sub { 1171 $self->{motion} = sub {
711 my ($ev, $x, $y) = @_; 1172 my ($ev, $x, $y) = @_;
712 1173
713 ($x, $y) = ($ev->{x}, $ev->{y}); 1174 ($x, $y) = ($ev->{x}, $ev->{y});
714 1175
715 $self->move ($bx + $x - $ox, $by + $y - $oy); 1176 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
716 $self->update;
717 }; 1177 };
1178 } else {
1179 return 0;
1180 }
1181
718 } 1182 1
719} 1183}
720 1184
721sub button_up { 1185sub button_up {
722 my ($self, $ev, $x, $y) = @_; 1186 my ($self, $ev, $x, $y) = @_;
723 1187
724 delete $self->{motion}; 1188 !!delete $self->{motion}
725} 1189}
726 1190
727sub mouse_motion { 1191sub mouse_motion {
728 my ($self, $ev, $x, $y) = @_; 1192 my ($self, $ev, $x, $y) = @_;
729 1193
730 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1194 $self->{motion}->($ev, $x, $y) if $self->{motion};
1195
1196 !!$self->{motion}
731} 1197}
732 1198
733sub _draw { 1199sub _draw {
734 my ($self) = @_; 1200 my ($self) = @_;
735 1201
1202 my $child = $self->{children}[0];
1203
736 my ($w, $h ) = ($self->{w}, $self->{h}); 1204 my ($w, $h ) = ($self->{w}, $self->{h});
737 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1205 my ($cw, $ch) = ($child->{w}, $child->{h});
738 1206
739 glEnable GL_BLEND;
740 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
741 glEnable GL_TEXTURE_2D; 1207 glEnable GL_TEXTURE_2D;
742 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1208 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
743 1209
744 my $border = $self->border; 1210 my $border = $self->border;
745 1211
746 glColor @{ $self->{border_bg} }; 1212 glColor @{ $self->{border_bg} };
747 $tex[1]->draw_quad (0, 0, $w, $border); 1213 $border[0]->draw_quad_alpha (0, 0, $w, $border);
748 $tex[3]->draw_quad (0, $border, $border, $ch); 1214 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
749 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1215 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
750 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1216 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
751 1217
752 my $bg = $tex[0]; 1218 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1219 glColor @{ $self->{bg} };
753 1220
754 # TODO: repeat texture not scale 1221 # TODO: repeat texture not scale
755 my $rep_x = $cw / $bg->{w}; 1222 # solve this better(?)
756 my $rep_y = $ch / $bg->{h}; 1223 $bg->{s} = $cw / $bg->{w};
757 1224 $bg->{t} = $ch / $bg->{h};
758 glColor @{ $self->{bg} };
759
760 $bg->{s} = $rep_x;
761 $bg->{t} = $rep_y;
762 $bg->{wrap_mode} = 1;
763 $bg->draw_quad ($border, $border, $cw, $ch); 1225 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1226 }
764 1227
765 glDisable GL_TEXTURE_2D; 1228 glDisable GL_TEXTURE_2D;
766 glDisable GL_BLEND;
767 1229
768 $self->{title}->draw if $self->{title};
769 $self->child->draw; 1230 $child->draw;
1231
1232 if ($self->{title}) {
1233 glTranslate 0, $border - $self->{h};
1234 $self->{title}->_draw;
1235 }
770} 1236}
771 1237
772############################################################################# 1238#############################################################################
773 1239
774package CFClient::UI::Table; 1240package CFClient::UI::Table;
… …
782sub new { 1248sub new {
783 my $class = shift; 1249 my $class = shift;
784 1250
785 $class->SUPER::new ( 1251 $class->SUPER::new (
786 col_expand => [], 1252 col_expand => [],
787 @_ 1253 @_,
788 ) 1254 )
1255}
1256
1257sub children {
1258 grep $_, map @$_, grep $_, @{ $_[0]{children} }
789} 1259}
790 1260
791sub add { 1261sub add {
792 my ($self, $x, $y, $child) = @_; 1262 my ($self, $x, $y, $child) = @_;
793 1263
794 $child->set_parent ($self); 1264 $child->set_parent ($self);
795 $self->{children}[$y][$x] = $child; 1265 $self->{children}[$y][$x] = $child;
796 1266
797 $child->check_size; 1267 $self->realloc;
798} 1268}
799 1269
800# 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?
801sub clear { 1271sub clear {
802 my ($self) = @_; 1272 my ($self) = @_;
803 1273
1274 my @children = $self->children;
804 delete $self->{children}; 1275 delete $self->{children};
805 $self->update; 1276
1277 for (@children) {
1278 delete $_->{parent};
1279 $_->hide;
1280 }
1281
1282 $self->realloc;
806} 1283}
807 1284
808sub get_wh { 1285sub get_wh {
809 my ($self) = @_; 1286 my ($self) = @_;
810 1287
… …
815 or next; 1292 or next;
816 1293
817 for my $x (0 .. $#$row) { 1294 for my $x (0 .. $#$row) {
818 my $widget = $row->[$x] 1295 my $widget = $row->[$x]
819 or next; 1296 or next;
820 my ($w, $h) = $widget->size_request; 1297 my ($w, $h) = @$widget{qw(req_w req_h)};
821 1298
822 $w[$x] = max $w[$x], $w; 1299 $w[$x] = max $w[$x], $w;
823 $h[$y] = max $h[$y], $h; 1300 $h[$y] = max $h[$y], $h;
824 } 1301 }
825 } 1302 }
… …
841sub size_allocate { 1318sub size_allocate {
842 my ($self, $w, $h) = @_; 1319 my ($self, $w, $h) = @_;
843 1320
844 my ($ws, $hs) = $self->get_wh; 1321 my ($ws, $hs) = $self->get_wh;
845 1322
846 my $req_w = sum @$ws; 1323 my $req_w = (sum @$ws) || 1;
847 my $req_h = sum @$hs; 1324 my $req_h = (sum @$hs) || 1;
848 1325
849 # TODO: nicer code && do row_expand 1326 # TODO: nicer code && do row_expand
850 my @col_expand = @{$self->{col_expand}}; 1327 my @col_expand = @{$self->{col_expand}};
851 @col_expand = (1) x @$ws unless @col_expand; 1328 @col_expand = (1) x @$ws unless @col_expand;
852 my $col_expand = (sum @col_expand) || 1; 1329 my $col_expand = (sum @col_expand) || 1;
… …
906 } 1383 }
907} 1384}
908 1385
909############################################################################# 1386#############################################################################
910 1387
911package CFClient::UI::HBox; 1388package CFClient::UI::Box;
912
913# TODO: wrap into common Box base class
914 1389
915our @ISA = CFClient::UI::Container::; 1390our @ISA = CFClient::UI::Container::;
916 1391
917sub size_request { 1392sub size_request {
918 my ($self) = @_; 1393 my ($self) = @_;
919 1394
920 my @alloc = map [$_->size_request], @{$self->{children}}; 1395 $self->{vertical}
921 1396 ? (
922 ( 1397 (List::Util::max map $_->{req_w}, @{$self->{children}}),
923 (List::Util::sum map $_->[0], @alloc), 1398 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
924 (List::Util::max map $_->[1], @alloc), 1399 )
925 ) 1400 : (
1401 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1402 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1403 )
926} 1404}
927 1405
928sub size_allocate { 1406sub size_allocate {
929 my ($self, $w, $h) = @_; 1407 my ($self, $w, $h) = @_;
930 1408
931 ($h, $w) = ($w, $h); 1409 my $space = $self->{vertical} ? $h : $w;
932
933 my $children = $self->{children}; 1410 my $children = $self->{children};
934 1411
935 my @h = map +($_->size_request)[0], @$children; 1412 my @req;
936 1413
937 my $req_h = List::Util::sum @h; 1414 if ($self->{homogeneous}) {
938 1415 @req = ($space / (@$children || 1)) x @$children;
939 if ($req_h > $h) {
940 # ah well, not enough space
941 $_ *= $h / $req_h for @h;
942 } 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 {
943 my $exp = List::Util::sum map $_->{expand}, @$children; 1424 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
944 $exp ||= 1;
945 1425
1426 $space = ($space - $req) / $expand; # remaining space to give away
1427
1428 $req[$_] += $space * $children->[$_]{expand}
946 for (0 .. $#$children) { 1429 for 0 .. $#$children;
947 my $child = $children->[$_];
948
949 my $alloc_h = $h[$_];
950 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
951 $h[$_] = $alloc_h;
952 } 1430 }
953 } 1431 }
954 1432
955 CFClient::UI::harmonize \@h; 1433 CFClient::UI::harmonize \@req;
956 1434
957 my $y = 0; 1435 my $pos = 0;
958 for (0 .. $#$children) { 1436 for (0 .. $#$children) {
959 my $child = $children->[$_];
960 my $h = $h[$_]; 1437 my $alloc = $req[$_];
961 $child->configure ($y, 0, $h, $w); 1438 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
962 1439
963 $y += $h; 1440 $pos += $alloc;
964 } 1441 }
965 1442
966 1 1443 1
967} 1444}
968 1445
969############################################################################# 1446#############################################################################
970 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
971package CFClient::UI::VBox; 1463package CFClient::UI::VBox;
972 1464
973# TODO: wrap into common Box base class
974
975our @ISA = CFClient::UI::Container::; 1465our @ISA = CFClient::UI::Box::;
976 1466
977sub size_request { 1467sub new {
978 my ($self) = @_; 1468 my $class = shift;
979 1469
980 my @alloc = map [$_->size_request], @{$self->{children}}; 1470 $class->SUPER::new (
981 1471 vertical => 1,
982 ( 1472 @_,
983 (List::Util::max map $_->[0], @alloc),
984 (List::Util::sum map $_->[1], @alloc),
985 ) 1473 )
986} 1474}
987 1475
988sub size_allocate {
989 my ($self, $w, $h) = @_;
990
991 my $children = $self->{children};
992
993 my @h = map +($_->size_request)[1], @$children;
994
995 my $req_h = List::Util::sum @h;
996
997 if ($req_h > $h) {
998 # ah well, not enough space
999 $_ *= $h / $req_h for @h;
1000 } else {
1001 my $exp = List::Util::sum map $_->{expand}, @$children;
1002 $exp ||= 1;
1003
1004 for (0 .. $#$children) {
1005 my $child = $children->[$_];
1006
1007 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1008 }
1009 }
1010
1011 CFClient::UI::harmonize \@h;
1012
1013 my $y = 0;
1014 for (0 .. $#$children) {
1015 my $child = $children->[$_];
1016 my $h = $h[$_];
1017 $child->configure (0, $y, $w, $h);
1018
1019 $y += $h;
1020 }
1021
1022 1
1023}
1024
1025############################################################################# 1476#############################################################################
1026 1477
1027package CFClient::UI::Label; 1478package CFClient::UI::Label;
1028 1479
1029our @ISA = CFClient::UI::Base::; 1480our @ISA = CFClient::UI::DrawBG::;
1030 1481
1031use CFClient::OpenGL; 1482use CFClient::OpenGL;
1032 1483
1033sub new { 1484sub new {
1034 my ($class, %arg) = @_; 1485 my ($class, %arg) = @_;
1035 1486
1036 my $self = $class->SUPER::new ( 1487 my $self = $class->SUPER::new (
1037 fg => [1, 1, 1], 1488 fg => [1, 1, 1],
1489 #bg => none
1490 #active_bg => none
1491 #font => default_font
1492 #text => initial text
1493 #markup => initial narkup
1494 #max_w => maximum pixel width
1495 ellipsise => 3, # end
1496 layout => (new CFClient::Layout),
1038 fontsize => 1, 1497 fontsize => 1,
1039 text => "",
1040 align => -1, 1498 align => -1,
1041 valign => -1, 1499 valign => -1,
1042 padding => 2, 1500 padding_x => 2,
1043 layout => new CFClient::Layout, 1501 padding_y => 2,
1502 can_events => 0,
1044 %arg 1503 %arg
1045 ); 1504 );
1046 1505
1047 if (exists $self->{template}) { 1506 if (exists $self->{template}) {
1048 my $layout = new CFClient::Layout; 1507 my $layout = new CFClient::Layout;
1049 $layout->set_text (delete $self->{template}); 1508 $layout->set_text (delete $self->{template});
1050 $self->{template} = $layout; 1509 $self->{template} = $layout;
1051 } 1510 }
1052 1511
1053 $self->set_text (delete $self->{text}) if exists $self->{text}; 1512 if (exists $self->{markup}) {
1054 $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 }
1055 1517
1056 $self 1518 $self
1057} 1519}
1058 1520
1059sub escape_text { 1521sub escape($) {
1060 local $_ = $_[1]; 1522 local $_ = $_[0];
1061 1523
1062 s/&/&amp;/g; 1524 s/&/&amp;/g;
1063 s/>/&gt;/g; 1525 s/>/&gt;/g;
1064 s/</&lt;/g; 1526 s/</&lt;/g;
1065 1527
1066 $_[1] 1528 $_
1529}
1530
1531sub update {
1532 my ($self) = @_;
1533
1534 delete $self->{texture};
1535 $self->SUPER::update;
1067} 1536}
1068 1537
1069sub set_text { 1538sub set_text {
1070 my ($self, $text) = @_; 1539 my ($self, $text) = @_;
1071 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;
1072 $self->{layout}->set_text ($text); 1545 $self->{layout}->set_text ($text);
1073 1546
1074 delete $self->{texture}; 1547 $self->realloc;
1075 $self->update; 1548 $self->update;
1076} 1549}
1077 1550
1078sub set_markup { 1551sub set_markup {
1079 my ($self, $markup) = @_; 1552 my ($self, $markup) = @_;
1080 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;
1081 $self->{layout}->set_markup ($markup); 1560 $self->{layout}->set_markup ($markup);
1082 1561
1083 delete $self->{texture}; 1562 $self->realloc;
1084 $self->update; 1563 $self->update;
1085} 1564}
1086 1565
1087sub size_request { 1566sub size_request {
1088 my ($self) = @_; 1567 my ($self) = @_;
1089 1568
1090 $self->{layout}->set_width; 1569 $self->{layout}->set_font ($self->{font}) if $self->{font};
1570 $self->{layout}->set_width ($self->{max_w} || -1);
1571 $self->{layout}->set_ellipsise ($self->{ellipsise});
1572 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1091 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1573 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1092 1574
1093 my ($w, $h) = $self->{layout}->size; 1575 my ($w, $h) = $self->{layout}->size;
1094 1576
1095 if (exists $self->{template}) { 1577 if (exists $self->{template}) {
1578 $self->{template}->set_font ($self->{font}) if $self->{font};
1096 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1579 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1097 1580
1098 my ($w2, $h2) = $self->{template}->size; 1581 my ($w2, $h2) = $self->{template}->size;
1099 1582
1100 $w = List::Util::max $w, $w2; 1583 $w = List::Util::max $w, $w2;
1101 $h = List::Util::max $h, $h2; 1584 $h = List::Util::max $h, $h2;
1102 } 1585 }
1103 1586
1104 ( 1587 ($w, $h)
1105 $w + $self->{padding} * 2,
1106 $h + $self->{padding} * 2,
1107 )
1108} 1588}
1109 1589
1110sub size_allocate { 1590sub size_allocate {
1111 my ($self, $w, $h) = @_; 1591 my ($self, $w, $h) = @_;
1112 1592
1593 delete $self->{ox};
1594
1113 delete $self->{texture}; 1595 delete $self->{texture}
1596 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1114} 1597}
1115 1598
1116sub set_fontsize { 1599sub set_fontsize {
1117 my ($self, $fontsize) = @_; 1600 my ($self, $fontsize) = @_;
1118 1601
1119 $self->{fontsize} = $fontsize; 1602 $self->{fontsize} = $fontsize;
1120 $self->update; 1603 delete $self->{texture};
1604
1605 $self->realloc;
1121} 1606}
1122 1607
1123sub _draw { 1608sub _draw {
1124 my ($self) = @_; 1609 my ($self) = @_;
1125 1610
1611 $self->SUPER::_draw; # draw background, if applicable
1612
1126 my $tex = $self->{texture} ||= do { 1613 my $tex = $self->{texture} ||= do {
1614 $self->{layout}->set_foreground (@{$self->{fg}});
1615 $self->{layout}->set_font ($self->{font}) if $self->{font};
1127 $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});
1128 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1619 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1620
1129 new_from_layout CFClient::Texture $self->{layout} 1621 new_from_layout CFClient::Texture $self->{layout}
1130 }; 1622 };
1131 1623
1132 glEnable GL_BLEND; 1624 unless (exists $self->{ox}) {
1133 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
1134 glEnable GL_TEXTURE_2D; 1634 glEnable GL_TEXTURE_2D;
1135 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1635 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1136 1636
1637 if ($tex->{format} == GL_ALPHA) {
1137 glColor @{$self->{fg}}; 1638 glColor @{$self->{fg}};
1138
1139 $self->{ox} = int (
1140 $self->{align} < 0 ? $self->{padding}
1141 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1142 : ($self->{w} - $tex->{w}) * 0.5
1143 );
1144
1145 $self->{oy} = int (
1146 $self->{valign} < 0 ? $self->{padding}
1147 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1148 : ($self->{h} - $tex->{h}) * 0.5
1149 );
1150
1151 $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 }
1152 1643
1153 glDisable GL_TEXTURE_2D; 1644 glDisable GL_TEXTURE_2D;
1154 glDisable GL_BLEND;
1155} 1645}
1156 1646
1157############################################################################# 1647#############################################################################
1158 1648
1159package CFClient::UI::EntryBase; 1649package CFClient::UI::EntryBase;
… …
1164 1654
1165sub new { 1655sub new {
1166 my $class = shift; 1656 my $class = shift;
1167 1657
1168 $class->SUPER::new ( 1658 $class->SUPER::new (
1169 fg => [1, 1, 1], 1659 fg => [1, 1, 1],
1170 bg => [0, 0, 0, 0.2], 1660 bg => [0, 0, 0, 0.2],
1171 active_bg => [1, 1, 1, 0.5], 1661 active_bg => [1, 1, 1, 0.5],
1172 active_fg => [0, 0, 0], 1662 active_fg => [0, 0, 0],
1173 can_hover => 1, 1663 can_hover => 1,
1174 can_focus => 1, 1664 can_focus => 1,
1175 valign => 0, 1665 valign => 0,
1666 can_events => 1,
1667 #text => ...
1176 @_ 1668 @_
1177 ) 1669 )
1178} 1670}
1179 1671
1180sub _set_text { 1672sub _set_text {
… …
1190 $self->{text} = $text; 1682 $self->{text} = $text;
1191 1683
1192 $text =~ s/./*/g if $self->{hidden}; 1684 $text =~ s/./*/g if $self->{hidden};
1193 $self->{layout}->set_text ("$text "); 1685 $self->{layout}->set_text ("$text ");
1194 1686
1195 $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;
1196} 1697}
1197 1698
1198sub get_text { 1699sub get_text {
1199 $_[0]{text} 1700 $_[0]{text}
1200} 1701}
… …
1203 my ($self) = @_; 1704 my ($self) = @_;
1204 1705
1205 my ($w, $h) = $self->SUPER::size_request; 1706 my ($w, $h) = $self->SUPER::size_request;
1206 1707
1207 ($w + 1, $h) # add 1 for cursor 1708 ($w + 1, $h) # add 1 for cursor
1208}
1209
1210sub size_allocate {
1211 my ($self, $w, $h) = @_;
1212
1213 $self->_set_text ($self->{text});
1214}
1215
1216sub set_text {
1217 my ($self, $text) = @_;
1218
1219 $self->{cursor} = length $text;
1220 $self->_set_text ($text);
1221 $self->update;
1222} 1709}
1223 1710
1224sub key_down { 1711sub key_down {
1225 my ($self, $ev) = @_; 1712 my ($self, $ev) = @_;
1226 1713
… …
1228 my $sym = $ev->{sym}; 1715 my $sym = $ev->{sym};
1229 my $uni = $ev->{unicode}; 1716 my $uni = $ev->{unicode};
1230 1717
1231 my $text = $self->get_text; 1718 my $text = $self->get_text;
1232 1719
1233 if ($sym == 8) { 1720 if ($uni == 8) {
1234 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1721 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1235 } elsif ($sym == 127) { 1722 } elsif ($uni == 127) {
1236 substr $text, $self->{cursor}, 1, ""; 1723 substr $text, $self->{cursor}, 1, "";
1237 } elsif ($sym == CFClient::SDLK_LEFT) { 1724 } elsif ($sym == CFClient::SDLK_LEFT) {
1238 --$self->{cursor} if $self->{cursor}; 1725 --$self->{cursor} if $self->{cursor};
1239 } elsif ($sym == CFClient::SDLK_RIGHT) { 1726 } elsif ($sym == CFClient::SDLK_RIGHT) {
1240 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1727 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1241 } elsif ($sym == CFClient::SDLK_HOME) { 1728 } elsif ($sym == CFClient::SDLK_HOME) {
1242 $self->{cursor} = 0; 1729 $self->{cursor} = 0;
1243 } elsif ($sym == CFClient::SDLK_END) { 1730 } elsif ($sym == CFClient::SDLK_END) {
1244 $self->{cursor} = length $text; 1731 $self->{cursor} = length $text;
1245 } elsif ($sym == 27) { 1732 } elsif ($uni == 27) {
1246 $self->emit ('escape'); 1733 $self->_emit ('escape');
1247 } elsif ($uni) { 1734 } elsif ($uni) {
1248 substr $text, $self->{cursor}++, 0, chr $uni; 1735 substr $text, $self->{cursor}++, 0, chr $uni;
1736 } else {
1737 return 0;
1249 } 1738 }
1250 1739
1251 $self->_set_text ($text); 1740 $self->_set_text ($text);
1252 $self->update; 1741
1742 $self->realloc;
1743
1744 1
1253} 1745}
1254 1746
1255sub focus_in { 1747sub focus_in {
1256 my ($self) = @_; 1748 my ($self) = @_;
1257 1749
… …
1272 utf8::encode $text; 1764 utf8::encode $text;
1273 $self->{cursor} = length substr $text, 0, $idx; 1765 $self->{cursor} = length substr $text, 0, $idx;
1274 1766
1275 $self->_set_text ($self->{text}); 1767 $self->_set_text ($self->{text});
1276 $self->update; 1768 $self->update;
1769
1770 1
1277} 1771}
1278 1772
1279sub mouse_motion { 1773sub mouse_motion {
1280 my ($self, $ev, $x, $y) = @_; 1774 my ($self, $ev, $x, $y) = @_;
1281# 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
1282} 1778}
1283 1779
1284sub _draw { 1780sub _draw {
1285 my ($self) = @_; 1781 my ($self) = @_;
1286 1782
… …
1333 my ($self, $ev) = @_; 1829 my ($self, $ev) = @_;
1334 1830
1335 my $sym = $ev->{sym}; 1831 my $sym = $ev->{sym};
1336 1832
1337 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} = '';
1338 $self->emit (activate => $self->get_text); 1838 $self->_emit (activate => $txt);
1339 $self->update; 1839 $self->update;
1340 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
1341 } else { 1863 } else {
1342 $self->SUPER::key_down ($ev); 1864 return $self->SUPER::key_down ($ev)
1865 }
1866
1343 } 1867 1
1344
1345} 1868}
1346 1869
1347############################################################################# 1870#############################################################################
1348 1871
1349package CFClient::UI::Button; 1872package CFClient::UI::Button;
… …
1358 1881
1359sub new { 1882sub new {
1360 my $class = shift; 1883 my $class = shift;
1361 1884
1362 $class->SUPER::new ( 1885 $class->SUPER::new (
1363 padding => 4, 1886 padding_x => 4,
1887 padding_y => 4,
1364 fg => [1, 1, 1], 1888 fg => [1, 1, 1],
1365 bg => [1, 1, 1, 0.2],
1366 active_fg => [0, 0, 1], 1889 active_fg => [0, 0, 1],
1367 can_hover => 1, 1890 can_hover => 1,
1368 align => 0, 1891 align => 0,
1369 valign => 0, 1892 valign => 0,
1893 can_events => 1,
1370 @_ 1894 @_
1371 ) 1895 )
1372} 1896}
1373 1897
1898sub activate { }
1899
1374sub button_up { 1900sub button_up {
1375 my ($self, $ev, $x, $y) = @_; 1901 my ($self, $ev, $x, $y) = @_;
1376 1902
1903 $self->emit ("activate")
1377 if ($x >= 0 && $x < $self->{w} 1904 if $x >= 0 && $x < $self->{w}
1378 && $y >= 0 && $y < $self->{h}) { 1905 && $y >= 0 && $y < $self->{h};
1379 $self->emit ("activate"); 1906
1380 } 1907 1
1381} 1908}
1382 1909
1383sub _draw { 1910sub _draw {
1384 my ($self) = @_; 1911 my ($self) = @_;
1385 1912
… …
1387 1914
1388 if ($GRAB == $self) { 1915 if ($GRAB == $self) {
1389 $self->{fg} = $self->{active_fg}; 1916 $self->{fg} = $self->{active_fg};
1390 } 1917 }
1391 1918
1392 glEnable GL_BLEND;
1393 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1394 glEnable GL_TEXTURE_2D; 1919 glEnable GL_TEXTURE_2D;
1395 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1920 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1396 glColor 0, 0, 0, 1; 1921 glColor 0, 0, 0, 1;
1397 1922
1398 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1923 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1399 1924
1400 glDisable GL_TEXTURE_2D; 1925 glDisable GL_TEXTURE_2D;
1401 glDisable GL_BLEND;
1402 1926
1403 $self->SUPER::_draw; 1927 $self->SUPER::_draw;
1404} 1928}
1405 1929
1406############################################################################# 1930#############################################################################
… …
1417 1941
1418sub new { 1942sub new {
1419 my $class = shift; 1943 my $class = shift;
1420 1944
1421 $class->SUPER::new ( 1945 $class->SUPER::new (
1422 padding => 2, 1946 padding_x => 2,
1947 padding_y => 2,
1423 fg => [1, 1, 1], 1948 fg => [1, 1, 1],
1424 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],
1425 state => 0, 1952 state => 0,
1426 can_hover => 1, 1953 can_hover => 1,
1427 @_ 1954 @_
1428 ) 1955 )
1429} 1956}
1430 1957
1431sub size_request { 1958sub size_request {
1432 my ($self) = @_; 1959 my ($self) = @_;
1433 1960
1434 ($self->{padding} * 2 + 6) x 2 1961 (6) x 2
1435} 1962}
1436 1963
1437sub button_down { 1964sub button_down {
1438 my ($self, $ev, $x, $y) = @_; 1965 my ($self, $ev, $x, $y) = @_;
1439 1966
1440 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1967 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1441 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1968 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1442 $self->{state} = !$self->{state}; 1969 $self->{state} = !$self->{state};
1443 $self->emit (changed => $self->{state}); 1970 $self->_emit (changed => $self->{state});
1971 } else {
1972 return 0
1973 }
1974
1444 } 1975 1
1445} 1976}
1446 1977
1447sub _draw { 1978sub _draw {
1448 my ($self) = @_; 1979 my ($self) = @_;
1449 1980
1450 $self->SUPER::_draw; 1981 $self->SUPER::_draw;
1451 1982
1452 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1983 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1453 1984
1454 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;
1455 1988
1456 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1989 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1457 1990
1458 glEnable GL_BLEND; 1991 my $tex = $self->{state} ? $tex[1] : $tex[0];
1992
1459 glEnable GL_TEXTURE_2D; 1993 glEnable GL_TEXTURE_2D;
1460 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1461
1462 my $tex = $self->{state} ? $tex[1] : $tex[0];
1463
1464 $tex->draw_quad (0, 0, $s, $s); 1994 $tex->draw_quad_alpha (0, 0, $s, $s);
1465
1466 glDisable GL_TEXTURE_2D; 1995 glDisable GL_TEXTURE_2D;
1467 glDisable GL_BLEND;
1468} 1996}
1469 1997
1470############################################################################# 1998#############################################################################
1471 1999
1472package CFClient::UI::Image; 2000package CFClient::UI::Image;
… …
1479our %loaded_images; 2007our %loaded_images;
1480 2008
1481sub new { 2009sub new {
1482 my $class = shift; 2010 my $class = shift;
1483 2011
1484 my $self = $class->SUPER::new (@_); 2012 my $self = $class->SUPER::new (can_events => 0, @_);
1485 2013
1486 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2014 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1487 2015
1488 $loaded_images{$self->{image}} ||= 2016 $loaded_images{$self->{image}} ||=
1489 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2017 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
1490 2018
1491 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2019 my $tex = $self->{tex} = $loaded_images{$self->{image}};
2020
2021 Scalar::Util::weaken $loaded_images{$self->{image}};
1492 2022
1493 $self->{aspect} = $tex->{w} / $tex->{h}; 2023 $self->{aspect} = $tex->{w} / $tex->{h};
1494 2024
1495 $self 2025 $self
1496} 2026}
… …
1513 glTranslate 0, -$self->{w}, 0; 2043 glTranslate 0, -$self->{w}, 0;
1514 2044
1515 ($w, $h) = ($h, $w); 2045 ($w, $h) = ($h, $w);
1516 } 2046 }
1517 2047
1518 glEnable GL_BLEND;
1519 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1520 glEnable GL_TEXTURE_2D; 2048 glEnable GL_TEXTURE_2D;
1521 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2049 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1522 2050
1523 $tex->draw_quad (0, 0, $w, $h); 2051 $tex->draw_quad_alpha (0, 0, $w, $h);
1524 2052
1525 glDisable GL_BLEND;
1526 glDisable GL_TEXTURE_2D; 2053 glDisable GL_TEXTURE_2D;
1527} 2054}
1528 2055
1529############################################################################# 2056#############################################################################
1530 2057
1531package CFClient::UI::VGauge; 2058package CFClient::UI::VGauge;
1532 2059
1533our @ISA = CFClient::UI::Base::; 2060our @ISA = CFClient::UI::Base::;
2061
2062use List::Util qw(min max);
1534 2063
1535use CFClient::OpenGL; 2064use CFClient::OpenGL;
1536 2065
1537my %tex = ( 2066my %tex = (
1538 food => [ 2067 food => [
1539 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2068 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1540 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2069 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1541 ], 2070 ],
1542 grace => [ 2071 grace => [
1543 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1544 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/
1545 ], 2074 ],
1546 hp => [ 2075 hp => [
1547 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2076 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1548 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2077 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1549 ], 2078 ],
1550 mana => [ 2079 mana => [
1551 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2080 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1552 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/
1553 ], 2082 ],
1554); 2083);
1555 2084
1556# eg. VGauge->new (gauge => 'food'), default gauge: food 2085# eg. VGauge->new (gauge => 'food'), default gauge: food
1557sub new { 2086sub new {
… …
1576} 2105}
1577 2106
1578sub set_max { 2107sub set_max {
1579 my ($self, $max) = @_; 2108 my ($self, $max) = @_;
1580 2109
2110 return if $self->{max_val} == $max;
2111
1581 $self->{max_val} = $max; 2112 $self->{max_val} = $max;
2113 $self->update;
1582} 2114}
1583 2115
1584sub set_value { 2116sub set_value {
1585 my ($self, $val, $max) = @_; 2117 my ($self, $val, $max) = @_;
1586 2118
1587 $self->set_max ($max) 2119 $self->set_max ($max)
1588 if defined $max; 2120 if defined $max;
1589 2121
1590 $max = $self->{max_val}; 2122 return if $self->{val} == $val;
2123
1591 $self->{val} = $val; 2124 $self->{val} = $val;
1592
1593 $self->update; 2125 $self->update;
1594} 2126}
1595 2127
1596sub _draw { 2128sub _draw {
1597 my ($self) = @_; 2129 my ($self) = @_;
1598 2130
1599 my $tex = $tex{$self->{type}}; 2131 my $tex = $tex{$self->{type}};
2132 my ($t1, $t2, $t3) = @$tex;
1600 2133
1601 my ($w, $h) = ($self->{w}, $self->{h}); 2134 my ($w, $h) = ($self->{w}, $self->{h});
1602 2135
1603 if ($self->{vertical}) { 2136 if ($self->{vertical}) {
1604 glRotate 90, 0, 0, 1; 2137 glRotate 90, 0, 0, 1;
… …
1606 2139
1607 ($w, $h) = ($h, $w); 2140 ($w, $h) = ($h, $w);
1608 } 2141 }
1609 2142
1610 my $ycut = $self->{val} / ($self->{max_val} || 1); 2143 my $ycut = $self->{val} / ($self->{max_val} || 1);
1611 $ycut = 1 if $self->{val} > $self->{max_val};
1612 2144
1613 my $t1 = $tex->[0]; 2145 my $ycut1 = max 0, min 1, $ycut;
1614 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);
1615 2150
1616 glEnable GL_BLEND; 2151 glEnable GL_BLEND;
1617 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2152 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1618 glEnable GL_TEXTURE_2D; 2153 glEnable GL_TEXTURE_2D;
1619 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2154 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1620 2155
1621 my $h1 = $self->{h} - $ycut * $self->{h};
1622 my $h2 = $ycut * $self->{h};
1623
1624 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2156 glBindTexture GL_TEXTURE_2D, $t1->{name};
1625 glBegin GL_QUADS; 2157 glBegin GL_QUADS;
1626 glTexCoord 0 , 0; glVertex 0 , 0; 2158 glTexCoord 0 , 0; glVertex 0 , 0;
1627 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 2159 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1628 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 2160 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1629 glTexCoord $t1->{s}, 0; glVertex $w, 0; 2161 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1630 glEnd; 2162 glEnd;
1631 2163
2164 my $ycut1 = List::Util::min 1, $ycut;
1632 glBindTexture GL_TEXTURE_2D, $t2->{name}; 2165 glBindTexture GL_TEXTURE_2D, $t2->{name};
1633 glBegin GL_QUADS; 2166 glBegin GL_QUADS;
1634 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 2167 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1635 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 2168 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1636 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 2169 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1637 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 2170 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1638 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 }
1639 2182
1640 glDisable GL_BLEND; 2183 glDisable GL_BLEND;
1641 glDisable GL_TEXTURE_2D; 2184 glDisable GL_TEXTURE_2D;
1642} 2185}
1643 2186
… …
1646package CFClient::UI::Gauge; 2189package CFClient::UI::Gauge;
1647 2190
1648our @ISA = CFClient::UI::VBox::; 2191our @ISA = CFClient::UI::VBox::;
1649 2192
1650sub new { 2193sub new {
1651 my ($class, %arg) = shift; 2194 my ($class, %arg) = @_;
1652 2195
1653 my $self = $class->SUPER::new ( 2196 my $self = $class->SUPER::new (
1654 @_, 2197 tooltip => $arg{type},
2198 can_hover => 1,
2199 can_events => 1,
2200 %arg,
1655 ); 2201 );
1656 2202
1657 $self->add ($self->{value} = new CFClient::UI::Label valign => 1, align => 0, template => "999"); 2203 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1658 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1); 2204 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1659 $self->add ($self->{max} = new CFClient::UI::Label valign => 1, align => 0, template => "999"); 2205 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1660 2206
1661 $self 2207 $self
1662} 2208}
1663 2209
1664sub set_fontsize { 2210sub set_fontsize {
1665 my ($self, $fsize) = @_; 2211 my ($self, $fsize) = @_;
1666 2212
1667 $self->{value}->set_fontsize ($fsize); 2213 $self->{value}->set_fontsize ($fsize);
1668 $self->{max} ->set_fontsize ($fsize); 2214 $self->{max} ->set_fontsize ($fsize);
1669 $self->update; 2215}
2216
2217sub set_max {
2218 my ($self, $max) = @_;
2219
2220 $self->{gauge}->set_max ($max);
2221 $self->{max}->set_text ($max);
1670} 2222}
1671 2223
1672sub set_value { 2224sub set_value {
1673 my ($self, $val, $max) = @_; 2225 my ($self, $val, $max) = @_;
1674 2226
1675 $self->set_max ($max) 2227 $self->set_max ($max)
1676 if defined $max; 2228 if defined $max;
1677 2229
1678 $self->{gauge}->set_value ($val, $max); 2230 $self->{gauge}->set_value ($val, $max);
1679 $self->{value}->set_text ($val); 2231 $self->{value}->set_text ($val);
1680}
1681
1682sub set_max {
1683 my ($self, $max) = @_;
1684
1685 $self->{gauge}->set_max ($max);
1686 $self->{max}->set_text ($max);
1687} 2232}
1688 2233
1689############################################################################# 2234#############################################################################
1690 2235
1691package CFClient::UI::Slider; 2236package CFClient::UI::Slider;
… …
1701 qw(s1_slider.png s1_slider_bg.png); 2246 qw(s1_slider.png s1_slider_bg.png);
1702 2247
1703sub new { 2248sub new {
1704 my $class = shift; 2249 my $class = shift;
1705 2250
1706 # range [value, low, high, page] 2251 # range [value, low, high, page, unit]
1707 2252
1708 # TODO: 0-width page 2253 # TODO: 0-width page
1709 # TODO: req_w/h are wrong with vertical 2254 # TODO: req_w/h are wrong with vertical
1710 # TODO: calculations are off 2255 # TODO: calculations are off
1711 my $self = $class->SUPER::new ( 2256 my $self = $class->SUPER::new (
1712 fg => [1, 1, 1], 2257 fg => [1, 1, 1],
1713 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],
1714 range => [0, 0, 100, 10], 2261 range => [0, 0, 100, 10, 0],
1715 req_w => 20, 2262 min_w => $::WIDTH / 80,
1716 req_h => 20, 2263 min_h => $::WIDTH / 80,
1717 vertical => 0, 2264 vertical => 0,
1718 can_hover => 1, 2265 can_hover => 1,
1719 inner_pad => 5, 2266 inner_pad => 0.02,
1720 @_ 2267 @_
1721 ); 2268 );
1722 2269
2270 $self->set_value ($self->{range}[0]);
2271 $self->update;
2272
1723 $self 2273 $self
1724} 2274}
1725 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
1726sub size_request { 2310sub size_request {
1727 my ($self) = @_; 2311 my ($self) = @_;
1728 2312
1729 my $w = $self->{req_w}; 2313 ($self->{req_w}, $self->{req_h})
1730 my $h = $self->{req_h};
1731
1732 $self->{vertical} ? ($h, $w) : ($w, $h)
1733} 2314}
1734 2315
1735sub button_down { 2316sub button_down {
1736 my ($self, $ev, $x, $y) = @_; 2317 my ($self, $ev, $x, $y) = @_;
1737 2318
1738 $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
1739 $self->mouse_motion ($ev, $x, $y); 2323 $self->mouse_motion ($ev, $x, $y)
1740} 2324}
1741 2325
1742sub mouse_motion { 2326sub mouse_motion {
1743 my ($self, $ev, $x, $y) = @_; 2327 my ($self, $ev, $x, $y) = @_;
1744 2328
1745 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
1746 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2350 my ($value, $lo, $hi, $page) = @{$self->{range}};
2351 my $range = ($hi - $page - $lo) || 1e-100;
1747 2352
1748 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2353 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1749 2354
1750 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2355 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1751 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2356 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1752 2357
1753 $x -= $inner_pad_px; # substract the padding 2358 $value = ($value - $lo) / $range;
1754 $x = $x * ($hi - $lo) / $inner_w + $lo; 2359 $value = $value * $self->{scale} + $self->{offset};
1755 $x = $lo if $x < $lo;
1756 $x = $hi - $page if $x > $hi - $page;
1757 $self->{range}[0] = $x;
1758 2360
1759 $self->emit (changed => $x); 2361 $self->{knob_x} = $value - $knob_w * 0.5;
1760 $self->update; 2362 $self->{knob_w} = $knob_w;
1761 } 2363 });
1762}
1763 2364
1764# the inner_* stuff is for generating a padding for the slider handle, 2365 $self->SUPER::update;
1765# so that the handle doesn't leave the texture. This calculation isn't 100%
1766# correct propably, but it does the job for now
1767sub _calc_inner_pad_px {
1768 my ($self, $w) = @_;
1769 ($w / 100) * $self->{inner_pad} # % to pixels
1770} 2366}
1771 2367
1772sub _draw { 2368sub _draw {
1773 my ($self) = @_; 2369 my ($self) = @_;
1774 2370
1775 $self->SUPER::_draw (); 2371 $self->SUPER::_draw ();
1776 2372
1777 my ($w, $h) = @$self{qw(w h)}; 2373 glScale $self->{w}, $self->{h};
1778 2374
1779 if ($self->{vertical}) { 2375 if ($self->{vertical}) {
1780 # draw a vertical slider like a rotated horizontal slider 2376 # draw a vertical slider like a rotated horizontal slider
1781 2377
2378 glTranslate 1, 0, 0;
1782 glRotate 90, 0, 0, 1; 2379 glRotate 90, 0, 0, 1;
1783 glTranslate 0, -$self->{w}, 0;
1784
1785 ($w, $h) = ($h, $w);
1786 } 2380 }
1787 2381
1788 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2382 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1789 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2383 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1790 2384
1791 my ($value, $lo, $hi, $page) = @{$self->{range}};
1792
1793 $hi = $value + 1 if $lo == $hi;
1794
1795 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1796 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1797
1798 $page = int $page * $inner_w / ($hi - $lo);
1799 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1800
1801 $w -= $page;
1802 $page &= ~1;
1803 glTranslate $page * 0.5, 0, 0;
1804 $page ||= 2;
1805
1806 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1807 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1808
1809 glEnable GL_BLEND;
1810 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1811 glEnable GL_TEXTURE_2D; 2385 glEnable GL_TEXTURE_2D;
1812 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2386 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1813 2387
1814 # draw background 2388 # draw background
1815 $tex[1]->draw_quad (0, 0, $w, $h); 2389 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1816 2390
1817 # draw handle 2391 # draw handle
1818 $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);
1819 2393
1820 glDisable GL_BLEND;
1821 glDisable GL_TEXTURE_2D; 2394 glDisable GL_TEXTURE_2D;
1822} 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 (@_) }
1823 2437
1824############################################################################# 2438#############################################################################
1825 2439
1826package CFClient::UI::TextView; 2440package CFClient::UI::TextView;
1827 2441
… …
1831 2445
1832sub new { 2446sub new {
1833 my $class = shift; 2447 my $class = shift;
1834 2448
1835 my $self = $class->SUPER::new ( 2449 my $self = $class->SUPER::new (
1836 fontsize => 1, 2450 fontsize => 1,
2451 can_events => 0,
2452 #font => default_font
1837 @_, 2453 @_,
1838 2454
1839 layout => (new CFClient::Layout), 2455 layout => (new CFClient::Layout 1),
1840 par => [], 2456 par => [],
1841 height => 0, 2457 height => 0,
1842 children => [ 2458 children => [
1843 (new CFClient::UI::Empty expand => 1), 2459 (new CFClient::UI::Empty expand => 1),
1844 (new CFClient::UI::Slider vertical => 1), 2460 (new CFClient::UI::Slider vertical => 1),
1845 ], 2461 ],
1846 ); 2462 );
1847 2463
1848 $self->{children}[1]->connect (changed => sub { 2464 $self->{children}[1]->connect (changed => sub { $self->update });
1849 $self->update;
1850 });
1851 2465
1852 $self 2466 $self
1853} 2467}
1854 2468
1855sub set_fontsize { 2469sub set_fontsize {
… …
1857 2471
1858 $self->{fontsize} = $fontsize; 2472 $self->{fontsize} = $fontsize;
1859 $self->reflow; 2473 $self->reflow;
1860} 2474}
1861 2475
2476sub size_allocate {
2477 my ($self, $w, $h) = @_;
2478
2479 $self->SUPER::size_allocate ($w, $h);
2480
2481 $self->{layout}->set_font ($self->{font}) if $self->{font};
2482 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2483 $self->{layout}->set_width ($self->{children}[0]{w});
2484
2485 $self->reflow;
2486}
2487
1862sub text_height { 2488sub text_size {
1863 my ($self, $text) = @_; 2489 my ($self, $text, $indent) = @_;
1864 2490
1865 my $layout = $self->{layout}; 2491 my $layout = $self->{layout};
1866 2492
1867 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2493 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1868 $layout->set_width ($self->{w}); 2494 $layout->set_width ($self->{children}[0]{w} - $indent);
1869 $layout->set_text ($text); 2495 $layout->set_markup ($text);
1870 2496
1871 ($layout->size)[1] 2497 $layout->size
1872} 2498}
1873 2499
1874sub reflow { 2500sub reflow {
1875 my ($self) = @_; 2501 my ($self) = @_;
1876 2502
1877 $self->{need_reflow}++; 2503 $self->{need_reflow}++;
1878 $self->update; 2504 $self->update;
1879} 2505}
1880 2506
1881sub size_allocate { 2507sub set_offset {
2508 my ($self, $offset) = @_;
2509
2510 # todo: base offset on lines or so, not on pixels
2511 $self->{children}[1]->set_value ($offset);
2512}
2513
2514sub clear {
1882 my ($self, $w, $h) = @_; 2515 my ($self) = @_;
1883 2516
1884 $self->SUPER::size_allocate ($w, $h); 2517 $self->{par} = [];
1885 2518 $self->{height} = 0;
1886 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2519 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
1887 $self->{layout}->set_width ($self->{children}[0]{w});
1888
1889 $self->reflow;
1890} 2520}
1891 2521
1892sub add_paragraph { 2522sub add_paragraph {
1893 my ($self, $color, $text) = @_; 2523 my ($self, $color, $text, $indent) = @_;
1894 2524
1895 #TODO: intelligently "reformat" paragraph 2525 for my $line (split /\n/, $text) {
1896 2526 my ($w, $h) = $self->text_size ($line);
1897 my $height = $self->text_height ($text);
1898
1899 $self->{height} += $height; 2527 $self->{height} += $h;
2528 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2529 }
1900 2530
1901 push @{$self->{par}}, [$height, $color, $text];
1902
1903 $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]);
1904 $self->{children}[1]->update;
1905} 2532}
1906 2533
1907sub update { 2534sub update {
1908 my ($self) = @_; 2535 my ($self) = @_;
1909 2536
… …
1911 2538
1912 return unless $self->{h} > 0; 2539 return unless $self->{h} > 0;
1913 2540
1914 delete $self->{texture}; 2541 delete $self->{texture};
1915 2542
1916 $ROOT->on_refresh ($self, sub { 2543 $ROOT->on_post_alloc ($self, sub {
2544 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2545
1917 if (delete $self->{need_reflow}) { 2546 if (delete $self->{need_reflow}) {
1918 my $height = 0; 2547 my $height = 0;
1919 2548
1920 $height += $_->[0] = $self->text_height ($_->[2]) 2549 my $layout = $self->{layout};
2550
2551 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2552
1921 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 }
1922 2564
1923 $self->{height} = $height; 2565 $self->{height} = $height;
1924 2566
1925 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2567 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
1926 2568
1927 delete $self->{texture}; 2569 delete $self->{texture};
1928 } 2570 }
1929 2571
1930 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2572 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
1931 glClearColor 0, 0, 0, 1; 2573 glClearColor 0.5, 0.5, 0.5, 0;
1932 glClear GL_COLOR_BUFFER_BIT; 2574 glClear GL_COLOR_BUFFER_BIT;
1933 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
1934 glEnable GL_BLEND; 2587 glEnable GL_BLEND;
2588 #TODO# not correct in windows where rgba is forced off
1935 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2589 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1936 glEnable GL_TEXTURE_2D;
1937 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1938
1939 my $top = int $self->{children}[1]{range}[0];
1940
1941 my $y0 = $top;
1942 my $y1 = $top + $self->{h};
1943
1944 my $y = 0;
1945
1946 my $layout = $self->{layout};
1947 2590
1948 for my $par (@{$self->{par}}) { 2591 for my $par (@{$self->{par}}) {
1949 my $h = $par->[0]; 2592 my $h = $par->[1];
1950 2593
1951 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]);
1952 $layout->set_text ($par->[2]); 2597 $layout->set_markup ($par->[4]);
1953 2598
1954 glColor @{ $par->[1] }; 2599 my ($w, $h, $data, $format, $internalformat) = $layout->render;
1955 my ($W, $H) = $layout->size; 2600
1956 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;
1957 } 2603 }
1958 2604
1959 $y += $h; 2605 $y += $h;
1960 } 2606 }
1961 2607
1962 glDisable GL_TEXTURE_2D;
1963 glDisable GL_BLEND; 2608 glDisable GL_BLEND;
1964 }; 2609 };
1965 }); 2610 });
1966} 2611}
1967 2612
1968sub _draw { 2613sub _draw {
1969 my ($self) = @_; 2614 my ($self) = @_;
1970 2615
1971 if ($self->{texture}) {
1972 glEnable GL_TEXTURE_2D; 2616 glEnable GL_TEXTURE_2D;
1973 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;
1974 $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});
1975 glDisable GL_TEXTURE_2D; 2620 glDisable GL_TEXTURE_2D;
1976 }
1977 2621
1978 $self->{children}[1]->draw; 2622 $self->{children}[1]->draw;
1979 2623
1980} 2624}
1981 2625
… …
2029 2673
2030sub new { 2674sub new {
2031 my $class = shift; 2675 my $class = shift;
2032 2676
2033 my $self = $class->SUPER::new ( 2677 my $self = $class->SUPER::new (
2034 state => 0, 2678 state => 0,
2035 connect_activate => \&toggle_flopper, 2679 on_activate => \&toggle_flopper,
2036 @_ 2680 @_
2037 ); 2681 );
2038 2682
2039 if ($self->{state}) {
2040 $self->{state} = 0;
2041 $self->toggle_flopper;
2042 }
2043
2044 $self 2683 $self
2045} 2684}
2046 2685
2047sub toggle_flopper { 2686sub toggle_flopper {
2048 my ($self) = @_; 2687 my ($self) = @_;
2049 2688
2050 # TODO: use animation 2689 $self->{other}->toggle_visibility;
2051 if ($self->{state} = !$self->{state}) { 2690}
2052 $CFClient::UI::ROOT->add ($self->{other}); 2691
2053 $self->{other}->move ($self->coord2global (0, $self->{h})); 2692#############################################################################
2693
2694package CFClient::UI::Tooltip;
2695
2696our @ISA = CFClient::UI::Bin::;
2697
2698use CFClient::OpenGL;
2699
2700sub new {
2701 my $class = shift;
2702
2703 $class->SUPER::new (
2704 @_,
2705 can_events => 0,
2706 )
2707}
2708
2709sub set_tooltip_from {
2710 my ($self, $widget) = @_;
2711
2712 my $tooltip = $widget->{tooltip};
2713
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 );
2729}
2730
2731sub size_request {
2732 my ($self) = @_;
2733
2734 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2735
2736 ($w + 4, $h + 4)
2737}
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
2763sub _draw {
2764 my ($self) = @_;
2765
2766 glTranslate 0.375, 0.375;
2767
2768 my ($w, $h) = @$self{qw(w h)};
2769
2770 glColor 1, 0.8, 0.4;
2771 glBegin GL_QUADS;
2772 glVertex 0 , 0;
2773 glVertex 0 , $h;
2774 glVertex $w, $h;
2775 glVertex $w, 0;
2776 glEnd;
2777
2778 glColor 0, 0, 0;
2779 glBegin GL_LINE_LOOP;
2780 glVertex 0 , 0;
2781 glVertex 0 , $h;
2782 glVertex $w, $h;
2783 glVertex $w, 0;
2784 glEnd;
2785
2786 glTranslate 2 - 0.375, 2 - 0.375;
2787
2788 $self->SUPER::_draw;
2789}
2790
2791#############################################################################
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
2054 $self->emit ("open"); 2948 $self->_emit ("popdown");
2949 $self->{hover}[1]->() if $self->{hover};
2055 } else { 2950 } else {
2056 $CFClient::UI::ROOT->remove ($self->{other}); 2951 return 0
2057 $self->emit ("close"); 2952 }
2953
2058 } 2954 1
2059
2060 $self->emit (changed => $self->{state});
2061} 2955}
2062 2956
2063############################################################################# 2957#############################################################################
2064 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
2065package CFClient::UI::Root; 3472package CFClient::UI::Root;
2066 3473
2067our @ISA = CFClient::UI::Container::; 3474our @ISA = CFClient::UI::Container::;
2068 3475
2069use CFClient::OpenGL; 3476use CFClient::OpenGL;
2070 3477
2071sub check_size { 3478sub new {
2072 my ($self) = @_; 3479 my $class = shift;
2073 3480
2074 $self->configure (0, 0, $::WITH, $::HEIGHT); 3481 my $self = $class->SUPER::new (
3482 visible => 1,
3483 @_,
3484 );
3485
3486 Scalar::Util::weaken ($self->{root} = $self);
3487
3488 $self
2075} 3489}
2076 3490
2077sub size_request { 3491sub size_request {
2078 ($::WIDTH, $::HEIGHT) 3492 my ($self) = @_;
2079}
2080 3493
2081sub 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 {
2082 my ($self, $x, $y, $w, $h) = @_; 3512 my ($self, $w, $h) = @_;
2083 3513
2084 $self->SUPER::configure ($x, $y, $w, $h); 3514 for my $child ($self->children) {
3515 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2085 3516
2086 $_->configure ($_->{x}, $_->{y}, $_->size_request) 3517 $X = $child->{force_x} if exists $child->{force_x};
2087 for @{$self->{children}}; 3518 $Y = $child->{force_y} if exists $child->{force_y};
2088}
2089 3519
2090sub _topleft { 3520 $X = _to_pixel $X, $W, $self->{w};
3521 $Y = _to_pixel $Y, $H, $self->{h};
3522
3523 $child->configure ($X, $Y, $W, $H);
3524 }
3525}
3526
3527sub coord2local {
2091 my ($self, $x, $y) = @_; 3528 my ($self, $x, $y) = @_;
2092 3529
2093 ($x, $y) 3530 ($x, $y)
2094} 3531}
2095 3532
3533sub coord2global {
3534 my ($self, $x, $y) = @_;
3535
3536 ($x, $y)
3537}
3538
2096sub update { 3539sub update {
2097 my ($self) = @_; 3540 my ($self) = @_;
2098 3541
2099 $self->check_size; 3542 $::WANT_REFRESH++;
2100 ::refresh ();
2101} 3543}
2102 3544
2103sub add { 3545sub add {
2104 my ($self, $child) = @_; 3546 my ($self, @children) = @_;
2105 3547
2106 # integerize window positions 3548 $_->{is_toplevel} = 1
2107 $child->{x} = int $child->{x}; 3549 for @children;
2108 $child->{y} = int $child->{y};
2109 3550
2110 $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 }
2111} 3567}
2112 3568
2113sub on_refresh { 3569sub on_refresh {
2114 my ($self, $id, $cb) = @_; 3570 my ($self, $id, $cb) = @_;
2115 3571
2116 $self->{refresh_hook}{$id} = $cb; 3572 $self->{refresh_hook}{$id} = $cb;
2117} 3573}
2118 3574
3575sub on_post_alloc {
3576 my ($self, $id, $cb) = @_;
3577
3578 $self->{post_alloc_hook}{$id} = $cb;
3579}
3580
2119sub draw { 3581sub draw {
2120 my ($self) = @_; 3582 my ($self) = @_;
2121 3583
2122 while (my $rcb = delete $self->{refresh_hook}) { 3584 while ($self->{refresh_hook}) {
2123 $_->() for values %$rcb; 3585 $_->()
3586 for values %{delete $self->{refresh_hook}};
2124 } 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
2125 3677
2126 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3678 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2127 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3679 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2128 glClear GL_COLOR_BUFFER_BIT; 3680 glClear GL_COLOR_BUFFER_BIT;
2129 3681
2130 glMatrixMode GL_PROJECTION; 3682 glMatrixMode GL_PROJECTION;
2131 glLoadIdentity; 3683 glLoadIdentity;
2132 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3684 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2133 glMatrixMode GL_MODELVIEW; 3685 glMatrixMode GL_MODELVIEW;
2134 glLoadIdentity; 3686 glLoadIdentity;
2135 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
2136 $self->_draw; 3695 $self->_draw;
2137} 3696}
2138 3697
2139############################################################################# 3698#############################################################################
2140 3699
2141package CFClient::UI; 3700package CFClient::UI;
2142 3701
2143$ROOT = new CFClient::UI::Root; 3702$ROOT = new CFClient::UI::Root;
3703$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2144 3704
21451 37051
2146 3706

Diff Legend

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