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

Diff Legend

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