ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.155 by root, Sun Apr 23 02:22:54 2006 UTC vs.
Revision 1.290 by root, Mon Jun 5 22:30:35 2006 UTC

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

Diff Legend

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