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.156 by elmex, Sun Apr 23 02:50:42 2006 UTC vs.
Revision 1.284 by root, Mon Jun 5 03:06:04 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 {
23 return if $ENV{CFPLUS_DEBUG} & 8;
24
17 if (!$GRAB) { 25 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 26 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (exists $widget->{tooltip}) { 27 if (length $widget->{tooltip}) {
20
21 if ($TOOLTIP->{owner} != $widget) { 28 if ($TOOLTIP->{owner} != $widget) {
29 $TOOLTIP->hide;
30
22 $TOOLTIP->{owner} = $widget; 31 $TOOLTIP->{owner} = $widget;
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
1141 delete $self->{texture}; 1559 delete $self->{req_h};
1142 $self->check_size; 1560
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
1151 delete $self->{texture}; 1575 delete $self->{req_h};
1152 $self->check_size; 1576
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 if (exists $self->{req_h}) {
1585 @$self{qw(req_w req_h)}
1586 } else {
1587 $self->{layout}->set_font ($self->{font}) if $self->{font};
1588 $self->{layout}->set_width ($self->{max_w} || -1);
1589 $self->{layout}->set_ellipsise ($self->{ellipsise});
1590 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1160 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1591 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1161 1592
1162 my ($w, $h) = $self->{layout}->size; 1593 my ($w, $h) = $self->{layout}->size;
1163 1594
1164 if (exists $self->{template}) { 1595 if (exists $self->{template}) {
1596 $self->{template}->set_font ($self->{font}) if $self->{font};
1165 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1597 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1166 1598
1167 my ($w2, $h2) = $self->{template}->size; 1599 my ($w2, $h2) = $self->{template}->size;
1168 1600
1169 $w = List::Util::max $w, $w2; 1601 $w = List::Util::max $w, $w2;
1170 $h = List::Util::max $h, $h2; 1602 $h = List::Util::max $h, $h2;
1171 } 1603 }
1172 1604
1605 ($w, $h)
1173 ( 1606 }
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;
1192} 1625}
1193 1626
1194sub _draw { 1627sub _draw {
1195 my ($self) = @_; 1628 my ($self) = @_;
1196 1629
1630 $self->SUPER::_draw; # draw background, if applicable
1631
1197 my $tex = $self->{texture} ||= do { 1632 my $tex = $self->{texture} ||= do {
1633 $self->{layout}->set_foreground (@{$self->{fg}});
1634 $self->{layout}->set_font ($self->{font}) if $self->{font};
1198 $self->{layout}->set_width ($self->{w}); 1635 $self->{layout}->set_width ($self->{w});
1636 $self->{layout}->set_ellipsise ($self->{ellipsise});
1637 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1199 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1638 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1639
1200 new_from_layout CFClient::Texture $self->{layout} 1640 new_from_layout CFClient::Texture $self->{layout}
1201 }; 1641 };
1202 1642
1203 glEnable GL_BLEND; 1643 unless (exists $self->{ox}) {
1204 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1644 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1645 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1646 : ($self->{w} - $tex->{w}) * 0.5);
1647
1648 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1649 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1650 : ($self->{h} - $tex->{h}) * 0.5);
1651 };
1652
1205 glEnable GL_TEXTURE_2D; 1653 glEnable GL_TEXTURE_2D;
1206 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1654 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1207 1655
1208 glColor @{$self->{fg}}; 1656 glColor_premultiply @{$self->{fg}}
1657 if $tex->{format} == GL_ALPHA;
1209 1658
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}); 1659 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1223 1660
1224 glDisable GL_TEXTURE_2D; 1661 glDisable GL_TEXTURE_2D;
1225 glDisable GL_BLEND;
1226} 1662}
1227 1663
1228############################################################################# 1664#############################################################################
1229 1665
1230package CFClient::UI::EntryBase; 1666package CFClient::UI::EntryBase;
… …
1235 1671
1236sub new { 1672sub new {
1237 my $class = shift; 1673 my $class = shift;
1238 1674
1239 $class->SUPER::new ( 1675 $class->SUPER::new (
1240 fg => [1, 1, 1], 1676 fg => [1, 1, 1],
1241 bg => [0, 0, 0, 0.2], 1677 bg => [0, 0, 0, 0.2],
1242 active_bg => [1, 1, 1, 0.5], 1678 active_bg => [1, 1, 1, 0.5],
1243 active_fg => [0, 0, 0], 1679 active_fg => [0, 0, 0],
1244 can_hover => 1, 1680 can_hover => 1,
1245 can_focus => 1, 1681 can_focus => 1,
1246 valign => 0, 1682 valign => 0,
1247 can_events => 1, 1683 can_events => 1,
1684 #text => ...
1248 @_ 1685 @_
1249 ) 1686 )
1250} 1687}
1251 1688
1252sub _set_text { 1689sub _set_text {
… …
1254 1691
1255 delete $self->{cur_h}; 1692 delete $self->{cur_h};
1256 1693
1257 return if $self->{text} eq $text; 1694 return if $self->{text} eq $text;
1258 1695
1259 delete $self->{texture};
1260
1261 $self->{last_activity} = $::NOW; 1696 $self->{last_activity} = $::NOW;
1262 $self->{text} = $text; 1697 $self->{text} = $text;
1263 1698
1264 $text =~ s/./*/g if $self->{hidden}; 1699 $text =~ s/./*/g if $self->{hidden};
1265 $self->{layout}->set_text ("$text "); 1700 $self->{layout}->set_text ("$text ");
1701 delete $self->{req_h};
1266 1702
1267 $self->emit (changed => $self->{text}); 1703 $self->_emit (changed => $self->{text});
1704
1705 $self->realloc;
1706 $self->update;
1707}
1708
1709sub set_text {
1710 my ($self, $text) = @_;
1711
1712 $self->{cursor} = length $text;
1713 $self->_set_text ($text);
1268} 1714}
1269 1715
1270sub get_text { 1716sub get_text {
1271 $_[0]{text} 1717 $_[0]{text}
1272} 1718}
… …
1275 my ($self) = @_; 1721 my ($self) = @_;
1276 1722
1277 my ($w, $h) = $self->SUPER::size_request; 1723 my ($w, $h) = $self->SUPER::size_request;
1278 1724
1279 ($w + 1, $h) # add 1 for cursor 1725 ($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} 1726}
1295 1727
1296sub key_down { 1728sub key_down {
1297 my ($self, $ev) = @_; 1729 my ($self, $ev) = @_;
1298 1730
… …
1300 my $sym = $ev->{sym}; 1732 my $sym = $ev->{sym};
1301 my $uni = $ev->{unicode}; 1733 my $uni = $ev->{unicode};
1302 1734
1303 my $text = $self->get_text; 1735 my $text = $self->get_text;
1304 1736
1305 if ($sym == 8) { 1737 if ($uni == 8) {
1306 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1738 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1307 } elsif ($sym == 127) { 1739 } elsif ($uni == 127) {
1308 substr $text, $self->{cursor}, 1, ""; 1740 substr $text, $self->{cursor}, 1, "";
1309 } elsif ($sym == CFClient::SDLK_LEFT) { 1741 } elsif ($sym == CFClient::SDLK_LEFT) {
1310 --$self->{cursor} if $self->{cursor}; 1742 --$self->{cursor} if $self->{cursor};
1311 } elsif ($sym == CFClient::SDLK_RIGHT) { 1743 } elsif ($sym == CFClient::SDLK_RIGHT) {
1312 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1744 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1313 } elsif ($sym == CFClient::SDLK_HOME) { 1745 } elsif ($sym == CFClient::SDLK_HOME) {
1314 $self->{cursor} = 0; 1746 $self->{cursor} = 0;
1315 } elsif ($sym == CFClient::SDLK_END) { 1747 } elsif ($sym == CFClient::SDLK_END) {
1316 $self->{cursor} = length $text; 1748 $self->{cursor} = length $text;
1317 } elsif ($sym == 27) { 1749 } elsif ($uni == 27) {
1318 $self->emit ('escape'); 1750 $self->_emit ('escape');
1319 } elsif ($uni) { 1751 } elsif ($uni) {
1320 substr $text, $self->{cursor}++, 0, chr $uni; 1752 substr $text, $self->{cursor}++, 0, chr $uni;
1753 } else {
1754 return 0;
1321 } 1755 }
1322 1756
1323 $self->_set_text ($text); 1757 $self->_set_text ($text);
1324 $self->update; 1758
1759 $self->realloc;
1760
1761 1
1325} 1762}
1326 1763
1327sub focus_in { 1764sub focus_in {
1328 my ($self) = @_; 1765 my ($self) = @_;
1329 1766
… …
1344 utf8::encode $text; 1781 utf8::encode $text;
1345 $self->{cursor} = length substr $text, 0, $idx; 1782 $self->{cursor} = length substr $text, 0, $idx;
1346 1783
1347 $self->_set_text ($self->{text}); 1784 $self->_set_text ($self->{text});
1348 $self->update; 1785 $self->update;
1786
1787 1
1349} 1788}
1350 1789
1351sub mouse_motion { 1790sub mouse_motion {
1352 my ($self, $ev, $x, $y) = @_; 1791 my ($self, $ev, $x, $y) = @_;
1353# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1792# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1793
1794 0
1354} 1795}
1355 1796
1356sub _draw { 1797sub _draw {
1357 my ($self) = @_; 1798 my ($self) = @_;
1358 1799
1359 local $self->{fg} = $self->{fg}; 1800 local $self->{fg} = $self->{fg};
1360 1801
1361 if ($FOCUS == $self) { 1802 if ($FOCUS == $self) {
1362 glColor @{$self->{active_bg}}; 1803 glColor_premultiply @{$self->{active_bg}};
1363 $self->{fg} = $self->{active_fg}; 1804 $self->{fg} = $self->{active_fg};
1364 } else { 1805 } else {
1365 glColor @{$self->{bg}}; 1806 glColor_premultiply @{$self->{bg}};
1366 } 1807 }
1367 1808
1368 glEnable GL_BLEND; 1809 glEnable GL_BLEND;
1369 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1810 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1370 glBegin GL_QUADS; 1811 glBegin GL_QUADS;
1371 glVertex 0 , 0; 1812 glVertex 0 , 0;
1372 glVertex 0 , $self->{h}; 1813 glVertex 0 , $self->{h};
1373 glVertex $self->{w}, $self->{h}; 1814 glVertex $self->{w}, $self->{h};
1374 glVertex $self->{w}, 0; 1815 glVertex $self->{w}, 0;
… …
1405 my ($self, $ev) = @_; 1846 my ($self, $ev) = @_;
1406 1847
1407 my $sym = $ev->{sym}; 1848 my $sym = $ev->{sym};
1408 1849
1409 if ($sym == 13) { 1850 if ($sym == 13) {
1851 unshift @{$self->{history}},
1852 my $txt = $self->get_text;
1853 $self->{history_pointer} = -1;
1854 $self->{history_saveback} = '';
1410 $self->emit (activate => $self->get_text); 1855 $self->_emit (activate => $txt);
1411 $self->update; 1856 $self->update;
1412 1857
1858 } elsif ($sym == CFClient::SDLK_UP) {
1859 if ($self->{history_pointer} < 0) {
1860 $self->{history_saveback} = $self->get_text;
1861 }
1862 if (@{$self->{history} || []} > 0) {
1863 $self->{history_pointer}++;
1864 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1865 $self->{history_pointer} = @{$self->{history} || []} - 1;
1866 }
1867 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1868 }
1869
1870 } elsif ($sym == CFClient::SDLK_DOWN) {
1871 $self->{history_pointer}--;
1872 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1873
1874 if ($self->{history_pointer} >= 0) {
1875 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1876 } else {
1877 $self->set_text ($self->{history_saveback});
1878 }
1879
1413 } else { 1880 } else {
1414 $self->SUPER::key_down ($ev); 1881 return $self->SUPER::key_down ($ev)
1882 }
1883
1415 } 1884 1
1416
1417} 1885}
1418 1886
1419############################################################################# 1887#############################################################################
1420 1888
1421package CFClient::UI::Button; 1889package CFClient::UI::Button;
… …
1430 1898
1431sub new { 1899sub new {
1432 my $class = shift; 1900 my $class = shift;
1433 1901
1434 $class->SUPER::new ( 1902 $class->SUPER::new (
1435 padding => 4, 1903 padding_x => 4,
1904 padding_y => 4,
1436 fg => [1, 1, 1], 1905 fg => [1, 1, 1],
1437 bg => [1, 1, 1, 0.2],
1438 active_fg => [0, 0, 1], 1906 active_fg => [0, 0, 1],
1439 can_hover => 1, 1907 can_hover => 1,
1440 align => 0, 1908 align => 0,
1441 valign => 0, 1909 valign => 0,
1442 can_events => 1, 1910 can_events => 1,
1443 @_ 1911 @_
1444 ) 1912 )
1445} 1913}
1446 1914
1915sub activate { }
1916
1447sub button_up { 1917sub button_up {
1448 my ($self, $ev, $x, $y) = @_; 1918 my ($self, $ev, $x, $y) = @_;
1449 1919
1920 $self->emit ("activate")
1450 if ($x >= 0 && $x < $self->{w} 1921 if $x >= 0 && $x < $self->{w}
1451 && $y >= 0 && $y < $self->{h}) { 1922 && $y >= 0 && $y < $self->{h};
1452 $self->emit ("activate"); 1923
1453 } 1924 1
1454} 1925}
1455 1926
1456sub _draw { 1927sub _draw {
1457 my ($self) = @_; 1928 my ($self) = @_;
1458 1929
1459 local $self->{fg} = $self->{fg}; 1930 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1460 1931
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; 1932 glEnable GL_TEXTURE_2D;
1468 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1933 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1469 glColor 0, 0, 0, 1; 1934 glColor 0, 0, 0, 1;
1470 1935
1471 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1936 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1472 1937
1473 glDisable GL_TEXTURE_2D; 1938 glDisable GL_TEXTURE_2D;
1474 glDisable GL_BLEND;
1475 1939
1476 $self->SUPER::_draw; 1940 $self->SUPER::_draw;
1477} 1941}
1478 1942
1479############################################################################# 1943#############################################################################
… …
1490 1954
1491sub new { 1955sub new {
1492 my $class = shift; 1956 my $class = shift;
1493 1957
1494 $class->SUPER::new ( 1958 $class->SUPER::new (
1495 padding => 2, 1959 padding_x => 2,
1960 padding_y => 2,
1496 fg => [1, 1, 1], 1961 fg => [1, 1, 1],
1497 active_fg => [1, 1, 0], 1962 active_fg => [1, 1, 0],
1963 bg => [0, 0, 0, 0.2],
1964 active_bg => [1, 1, 1, 0.5],
1498 state => 0, 1965 state => 0,
1499 can_hover => 1, 1966 can_hover => 1,
1500 @_ 1967 @_
1501 ) 1968 )
1502} 1969}
1503 1970
1504sub size_request { 1971sub size_request {
1505 my ($self) = @_; 1972 my ($self) = @_;
1506 1973
1507 ($self->{padding} * 2 + 6) x 2 1974 (6) x 2
1508} 1975}
1509 1976
1510sub button_down { 1977sub button_down {
1511 my ($self, $ev, $x, $y) = @_; 1978 my ($self, $ev, $x, $y) = @_;
1512 1979
1513 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1980 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1514 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1981 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1515 $self->{state} = !$self->{state}; 1982 $self->{state} = !$self->{state};
1516 $self->emit (changed => $self->{state}); 1983 $self->_emit (changed => $self->{state});
1984 } else {
1985 return 0
1986 }
1987
1517 } 1988 1
1518} 1989}
1519 1990
1520sub _draw { 1991sub _draw {
1521 my ($self) = @_; 1992 my ($self) = @_;
1522 1993
1523 $self->SUPER::_draw; 1994 $self->SUPER::_draw;
1524 1995
1525 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1996 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1526 1997
1527 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1998 my ($w, $h) = @$self{qw(w h)};
1999
2000 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1528 2001
1529 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2002 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1530 2003
1531 glEnable GL_BLEND; 2004 my $tex = $self->{state} ? $tex[1] : $tex[0];
2005
1532 glEnable GL_TEXTURE_2D; 2006 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); 2007 $tex->draw_quad_alpha (0, 0, $s, $s);
1538
1539 glDisable GL_TEXTURE_2D; 2008 glDisable GL_TEXTURE_2D;
1540 glDisable GL_BLEND;
1541} 2009}
1542 2010
1543############################################################################# 2011#############################################################################
1544 2012
1545package CFClient::UI::Image; 2013package CFClient::UI::Image;
… …
1588 glTranslate 0, -$self->{w}, 0; 2056 glTranslate 0, -$self->{w}, 0;
1589 2057
1590 ($w, $h) = ($h, $w); 2058 ($w, $h) = ($h, $w);
1591 } 2059 }
1592 2060
1593 glEnable GL_BLEND;
1594 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1595 glEnable GL_TEXTURE_2D; 2061 glEnable GL_TEXTURE_2D;
1596 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2062 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1597 2063
1598 $tex->draw_quad (0, 0, $w, $h); 2064 $tex->draw_quad_alpha (0, 0, $w, $h);
1599 2065
1600 glDisable GL_BLEND;
1601 glDisable GL_TEXTURE_2D; 2066 glDisable GL_TEXTURE_2D;
1602} 2067}
1603 2068
1604############################################################################# 2069#############################################################################
1605 2070
1606package CFClient::UI::VGauge; 2071package CFClient::UI::VGauge;
1607 2072
1608our @ISA = CFClient::UI::Base::; 2073our @ISA = CFClient::UI::Base::;
2074
2075use List::Util qw(min max);
1609 2076
1610use CFClient::OpenGL; 2077use CFClient::OpenGL;
1611 2078
1612my %tex = ( 2079my %tex = (
1613 food => [ 2080 food => [
1614 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2081 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1615 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2082 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1616 ], 2083 ],
1617 grace => [ 2084 grace => [
1618 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2085 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1619 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ 2086 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1620 ], 2087 ],
1621 hp => [ 2088 hp => [
1622 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2089 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1623 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2090 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1624 ], 2091 ],
1625 mana => [ 2092 mana => [
1626 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2093 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1627 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ 2094 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1628 ], 2095 ],
1629); 2096);
1630 2097
1631# eg. VGauge->new (gauge => 'food'), default gauge: food 2098# eg. VGauge->new (gauge => 'food'), default gauge: food
1632sub new { 2099sub new {
… …
1651} 2118}
1652 2119
1653sub set_max { 2120sub set_max {
1654 my ($self, $max) = @_; 2121 my ($self, $max) = @_;
1655 2122
2123 return if $self->{max_val} == $max;
2124
1656 $self->{max_val} = $max; 2125 $self->{max_val} = $max;
2126 $self->update;
1657} 2127}
1658 2128
1659sub set_value { 2129sub set_value {
1660 my ($self, $val, $max) = @_; 2130 my ($self, $val, $max) = @_;
1661 2131
1662 $self->set_max ($max) 2132 $self->set_max ($max)
1663 if defined $max; 2133 if defined $max;
1664 2134
1665 $max = $self->{max_val}; 2135 return if $self->{val} == $val;
2136
1666 $self->{val} = $val; 2137 $self->{val} = $val;
1667
1668 $self->update; 2138 $self->update;
1669} 2139}
1670 2140
1671sub _draw { 2141sub _draw {
1672 my ($self) = @_; 2142 my ($self) = @_;
1673 2143
1674 my $tex = $tex{$self->{type}}; 2144 my $tex = $tex{$self->{type}};
2145 my ($t1, $t2, $t3) = @$tex;
1675 2146
1676 my ($w, $h) = ($self->{w}, $self->{h}); 2147 my ($w, $h) = ($self->{w}, $self->{h});
1677 2148
1678 if ($self->{vertical}) { 2149 if ($self->{vertical}) {
1679 glRotate 90, 0, 0, 1; 2150 glRotate 90, 0, 0, 1;
… …
1681 2152
1682 ($w, $h) = ($h, $w); 2153 ($w, $h) = ($h, $w);
1683 } 2154 }
1684 2155
1685 my $ycut = $self->{val} / ($self->{max_val} || 1); 2156 my $ycut = $self->{val} / ($self->{max_val} || 1);
1686 $ycut = 1 if $self->{val} > $self->{max_val};
1687 2157
1688 my $t1 = $tex->[0]; 2158 my $ycut1 = max 0, min 1, $ycut;
1689 my $t2 = $tex->[1]; 2159 my $ycut2 = max 0, min 1, $ycut - 1;
2160
2161 my $h1 = $self->{h} * (1 - $ycut1);
2162 my $h2 = $self->{h} * (1 - $ycut2);
1690 2163
1691 glEnable GL_BLEND; 2164 glEnable GL_BLEND;
1692 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2165 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2166 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1693 glEnable GL_TEXTURE_2D; 2167 glEnable GL_TEXTURE_2D;
1694 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2168 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1695 2169
1696 my $h1 = $self->{h} - $ycut * $self->{h};
1697 my $h2 = $ycut * $self->{h};
1698
1699 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2170 glBindTexture GL_TEXTURE_2D, $t1->{name};
1700 glBegin GL_QUADS; 2171 glBegin GL_QUADS;
1701 glTexCoord 0 , 0; glVertex 0 , 0; 2172 glTexCoord 0 , 0; glVertex 0 , 0;
1702 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 2173 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1703 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 2174 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1704 glTexCoord $t1->{s}, 0; glVertex $w, 0; 2175 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1705 glEnd; 2176 glEnd;
1706 2177
2178 my $ycut1 = List::Util::min 1, $ycut;
1707 glBindTexture GL_TEXTURE_2D, $t2->{name}; 2179 glBindTexture GL_TEXTURE_2D, $t2->{name};
1708 glBegin GL_QUADS; 2180 glBegin GL_QUADS;
1709 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 2181 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1710 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 2182 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1711 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 2183 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1712 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 2184 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1713 glEnd; 2185 glEnd;
2186
2187 if ($t3) {
2188 glBindTexture GL_TEXTURE_2D, $t3->{name};
2189 glBegin GL_QUADS;
2190 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2191 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
2192 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
2193 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2194 glEnd;
2195 }
1714 2196
1715 glDisable GL_BLEND; 2197 glDisable GL_BLEND;
1716 glDisable GL_TEXTURE_2D; 2198 glDisable GL_TEXTURE_2D;
1717} 2199}
1718 2200
… …
1724 2206
1725sub new { 2207sub new {
1726 my ($class, %arg) = @_; 2208 my ($class, %arg) = @_;
1727 2209
1728 my $self = $class->SUPER::new ( 2210 my $self = $class->SUPER::new (
1729 tooltip => $arg{type}, 2211 tooltip => $arg{type},
2212 can_hover => 1,
2213 can_events => 1,
1730 %arg, 2214 %arg,
1731 ); 2215 );
1732 2216
1733 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999", can_events => 1, can_hover => 1); 2217 $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, can_events => 1, can_hover => 1); 2218 $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", can_events => 1, can_hover => 1); 2219 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1736 2220
1737 $self 2221 $self
1738} 2222}
1739 2223
1740sub set_fontsize { 2224sub set_fontsize {
… …
1742 2226
1743 $self->{value}->set_fontsize ($fsize); 2227 $self->{value}->set_fontsize ($fsize);
1744 $self->{max} ->set_fontsize ($fsize); 2228 $self->{max} ->set_fontsize ($fsize);
1745} 2229}
1746 2230
2231sub set_max {
2232 my ($self, $max) = @_;
2233
2234 $self->{gauge}->set_max ($max);
2235 $self->{max}->set_text ($max);
2236}
2237
1747sub set_value { 2238sub set_value {
1748 my ($self, $val, $max) = @_; 2239 my ($self, $val, $max) = @_;
1749 2240
1750 $self->set_max ($max) 2241 $self->set_max ($max)
1751 if defined $max; 2242 if defined $max;
1752 2243
1753 $self->{gauge}->set_value ($val, $max); 2244 $self->{gauge}->set_value ($val, $max);
1754 $self->{value}->set_text ($val); 2245 $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} 2246}
1763 2247
1764############################################################################# 2248#############################################################################
1765 2249
1766package CFClient::UI::Slider; 2250package CFClient::UI::Slider;
… …
1776 qw(s1_slider.png s1_slider_bg.png); 2260 qw(s1_slider.png s1_slider_bg.png);
1777 2261
1778sub new { 2262sub new {
1779 my $class = shift; 2263 my $class = shift;
1780 2264
1781 # range [value, low, high, page] 2265 # range [value, low, high, page, unit]
1782 2266
1783 # TODO: 0-width page 2267 # TODO: 0-width page
1784 # TODO: req_w/h are wrong with vertical 2268 # TODO: req_w/h are wrong with vertical
1785 # TODO: calculations are off 2269 # TODO: calculations are off
1786 my $self = $class->SUPER::new ( 2270 my $self = $class->SUPER::new (
1787 fg => [1, 1, 1], 2271 fg => [1, 1, 1],
1788 active_fg => [0, 0, 0], 2272 active_fg => [0, 0, 0],
2273 bg => [0, 0, 0, 0.2],
2274 active_bg => [1, 1, 1, 0.5],
1789 range => [0, 0, 100, 10], 2275 range => [0, 0, 100, 10, 0],
1790 req_w => 20, 2276 min_w => $::WIDTH / 80,
1791 req_h => 20, 2277 min_h => $::WIDTH / 80,
1792 vertical => 0, 2278 vertical => 0,
1793 can_hover => 1, 2279 can_hover => 1,
1794 inner_pad => 5, 2280 inner_pad => 0.02,
1795 @_ 2281 @_
1796 ); 2282 );
1797 2283
2284 $self->set_value ($self->{range}[0]);
2285 $self->update;
2286
1798 $self 2287 $self
1799} 2288}
1800 2289
2290sub changed { }
2291
2292sub set_range {
2293 my ($self, $range) = @_;
2294
2295 ($range, $self->{range}) = ($self->{range}, $range);
2296
2297 $self->update
2298 if "@$range" ne "@{$self->{range}}";
2299}
2300
2301sub set_value {
2302 my ($self, $value) = @_;
2303
2304 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2305
2306 $hi = $lo + 1 if $hi <= $lo;
2307
2308 $page = $hi - $lo if $page > $hi - $lo;
2309
2310 $value = $lo if $value < $lo;
2311 $value = $hi - $page if $value > $hi - $page;
2312
2313 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2314 if $unit;
2315
2316 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2317
2318 if ($value != $old_value) {
2319 $self->_emit (changed => $value);
2320 $self->update;
2321 }
2322}
2323
1801sub size_request { 2324sub size_request {
1802 my ($self) = @_; 2325 my ($self) = @_;
1803 2326
1804 my $w = $self->{req_w}; 2327 ($self->{req_w}, $self->{req_h})
1805 my $h = $self->{req_h};
1806
1807 $self->{vertical} ? ($h, $w) : ($w, $h)
1808} 2328}
1809 2329
1810sub button_down { 2330sub button_down {
1811 my ($self, $ev, $x, $y) = @_; 2331 my ($self, $ev, $x, $y) = @_;
1812 2332
1813 $self->SUPER::button_down ($ev, $x, $y); 2333 $self->SUPER::button_down ($ev, $x, $y);
2334
2335 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2336
1814 $self->mouse_motion ($ev, $x, $y); 2337 $self->mouse_motion ($ev, $x, $y)
1815} 2338}
1816 2339
1817sub mouse_motion { 2340sub mouse_motion {
1818 my ($self, $ev, $x, $y) = @_; 2341 my ($self, $ev, $x, $y) = @_;
1819 2342
1820 if ($GRAB == $self) { 2343 if ($GRAB == $self) {
2344 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2345
2346 my (undef, $lo, $hi, $page) = @{$self->{range}};
2347
2348 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2349
2350 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2351 } else {
2352 return 0;
2353 }
2354
2355 1
2356}
2357
2358sub update {
2359 my ($self) = @_;
2360
2361 delete $self->{knob_w};
2362 $self->SUPER::update;
2363}
2364
2365sub _draw {
2366 my ($self) = @_;
2367
2368 unless ($self->{knob_w}) {
2369 $self->set_value ($self->{range}[0]);
2370
1821 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2371 my ($value, $lo, $hi, $page) = @{$self->{range}};
2372 my $range = ($hi - $page - $lo) || 1e-100;
1822 2373
1823 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2374 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1824 2375
1825 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2376 $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 2377 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1827 2378
1828 $x -= $inner_pad_px; # substract the padding 2379 $value = ($value - $lo) / $range;
1829 $x = $x * ($hi - $lo) / $inner_w + $lo; 2380 $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 2381
1834 $self->emit (changed => $x); 2382 $self->{knob_x} = $value - $knob_w * 0.5;
1835 $self->update; 2383 $self->{knob_w} = $knob_w;
1836 } 2384 }
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 2385
1850 $self->SUPER::_draw (); 2386 $self->SUPER::_draw ();
1851 2387
1852 my ($w, $h) = @$self{qw(w h)}; 2388 glScale $self->{w}, $self->{h};
1853 2389
1854 if ($self->{vertical}) { 2390 if ($self->{vertical}) {
1855 # draw a vertical slider like a rotated horizontal slider 2391 # draw a vertical slider like a rotated horizontal slider
1856 2392
2393 glTranslate 1, 0, 0;
1857 glRotate 90, 0, 0, 1; 2394 glRotate 90, 0, 0, 1;
1858 glTranslate 0, -$self->{w}, 0;
1859
1860 ($w, $h) = ($h, $w);
1861 } 2395 }
1862 2396
1863 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2397 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1864 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2398 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1865 2399
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; 2400 glEnable GL_TEXTURE_2D;
1887 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2401 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1888 2402
1889 # draw background 2403 # draw background
1890 $tex[1]->draw_quad (0, 0, $w, $h); 2404 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1891 2405
1892 # draw handle 2406 # draw handle
1893 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2407 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
1894 2408
1895 glDisable GL_BLEND;
1896 glDisable GL_TEXTURE_2D; 2409 glDisable GL_TEXTURE_2D;
1897} 2410}
2411
2412#############################################################################
2413
2414package CFClient::UI::ValSlider;
2415
2416our @ISA = CFClient::UI::HBox::;
2417
2418sub new {
2419 my ($class, %arg) = @_;
2420
2421 my $range = delete $arg{range};
2422
2423 my $self = $class->SUPER::new (
2424 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2425 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2426 to_value => sub { shift },
2427 from_value => sub { shift },
2428 %arg,
2429 );
2430
2431 $self->{slider}->connect (changed => sub {
2432 my ($self, $value) = @_;
2433 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2434 $self->{parent}->emit (changed => $value);
2435 });
2436
2437# $self->{entry}->connect (changed => sub {
2438# my ($self, $value) = @_;
2439# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2440# $self->{parent}->emit (changed => $value);
2441# });
2442
2443 $self->add ($self->{slider}, $self->{entry});
2444
2445 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2446
2447 $self
2448}
2449
2450sub set_range { shift->{slider}->set_range (@_) }
2451sub set_value { shift->{slider}->set_value (@_) }
1898 2452
1899############################################################################# 2453#############################################################################
1900 2454
1901package CFClient::UI::TextView; 2455package CFClient::UI::TextView;
1902 2456
… …
1906 2460
1907sub new { 2461sub new {
1908 my $class = shift; 2462 my $class = shift;
1909 2463
1910 my $self = $class->SUPER::new ( 2464 my $self = $class->SUPER::new (
1911 fontsize => 1, 2465 fontsize => 1,
2466 can_events => 0,
2467 #font => default_font
1912 @_, 2468 @_,
1913 2469
1914 layout => (new CFClient::Layout), 2470 layout => (new CFClient::Layout 1),
1915 par => [], 2471 par => [],
1916 height => 0, 2472 height => 0,
1917 children => [ 2473 children => [
1918 (new CFClient::UI::Empty expand => 1), 2474 (new CFClient::UI::Empty expand => 1),
1919 (new CFClient::UI::Slider vertical => 1), 2475 (new CFClient::UI::Slider vertical => 1),
1920 ], 2476 ],
1921 ); 2477 );
1922 2478
1923 $self->{children}[1]->connect (changed => sub { 2479 $self->{children}[1]->connect (changed => sub { $self->update });
1924 $self->update;
1925 });
1926 2480
1927 $self 2481 $self
1928} 2482}
1929 2483
1930sub set_fontsize { 2484sub set_fontsize {
… …
1932 2486
1933 $self->{fontsize} = $fontsize; 2487 $self->{fontsize} = $fontsize;
1934 $self->reflow; 2488 $self->reflow;
1935} 2489}
1936 2490
2491sub size_allocate {
2492 my ($self, $w, $h) = @_;
2493
2494 $self->SUPER::size_allocate ($w, $h);
2495
2496 $self->{layout}->set_font ($self->{font}) if $self->{font};
2497 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2498 $self->{layout}->set_width ($self->{children}[0]{w});
2499
2500 $self->reflow;
2501}
2502
1937sub text_height { 2503sub text_size {
1938 my ($self, $text) = @_; 2504 my ($self, $text, $indent) = @_;
1939 2505
1940 my $layout = $self->{layout}; 2506 my $layout = $self->{layout};
1941 2507
1942 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2508 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1943 $layout->set_width ($self->{w}); 2509 $layout->set_width ($self->{children}[0]{w} - $indent);
1944 $layout->set_text ($text); 2510 $layout->set_markup ($text);
1945 2511
1946 ($layout->size)[1] 2512 $layout->size
1947} 2513}
1948 2514
1949sub reflow { 2515sub reflow {
1950 my ($self) = @_; 2516 my ($self) = @_;
1951 2517
1952 $self->{need_reflow}++; 2518 $self->{need_reflow}++;
1953 $self->update; 2519 $self->update;
1954} 2520}
1955 2521
1956sub size_allocate { 2522sub set_offset {
2523 my ($self, $offset) = @_;
2524
2525 # todo: base offset on lines or so, not on pixels
2526 $self->{children}[1]->set_value ($offset);
2527}
2528
2529sub clear {
1957 my ($self, $w, $h) = @_; 2530 my ($self) = @_;
1958 2531
1959 $self->SUPER::size_allocate ($w, $h); 2532 $self->{par} = [];
1960 2533 $self->{height} = 0;
1961 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2534 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
1962 $self->{layout}->set_width ($self->{children}[0]{w});
1963
1964 $self->reflow;
1965} 2535}
1966 2536
1967sub add_paragraph { 2537sub add_paragraph {
1968 my ($self, $color, $text) = @_; 2538 my ($self, $color, $text, $indent) = @_;
1969 2539
1970 #TODO: intelligently "reformat" paragraph 2540 for my $line (split /\n/, $text) {
1971 2541 my ($w, $h) = $self->text_size ($line);
1972 my $height = $self->text_height ($text);
1973
1974 $self->{height} += $height; 2542 $self->{height} += $h;
2543 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2544 }
1975 2545
1976 push @{$self->{par}}, [$height, $color, $text];
1977
1978 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2546 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
1979 $self->{children}[1]->update;
1980} 2547}
1981 2548
1982sub update { 2549sub update {
1983 my ($self) = @_; 2550 my ($self) = @_;
1984 2551
… …
1986 2553
1987 return unless $self->{h} > 0; 2554 return unless $self->{h} > 0;
1988 2555
1989 delete $self->{texture}; 2556 delete $self->{texture};
1990 2557
1991 $ROOT->on_refresh ($self, sub { 2558 $ROOT->on_post_alloc ($self, sub {
2559 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2560
1992 if (delete $self->{need_reflow}) { 2561 if (delete $self->{need_reflow}) {
1993 my $height = 0; 2562 my $height = 0;
1994 2563
1995 $height += $_->[0] = $self->text_height ($_->[2]) 2564 my $layout = $self->{layout};
2565
2566 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2567
1996 for @{$self->{par}}; 2568 for (@{$self->{par}}) {
2569 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2570 $layout->set_width ($W - $_->[3]);
2571 $layout->set_markup ($_->[4]);
2572 my ($w, $h) = $layout->size;
2573 $_->[0] = $w + $_->[3];
2574 $_->[1] = $h;
2575 }
2576
2577 $height += $_->[1];
2578 }
1997 2579
1998 $self->{height} = $height; 2580 $self->{height} = $height;
1999 2581
2000 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2582 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2001 2583
2002 delete $self->{texture}; 2584 delete $self->{texture};
2003 } 2585 }
2004 2586
2005 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2587 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2006 glClearColor 0, 0, 0, 1; 2588 glClearColor 0, 0, 0, 0;
2007 glClear GL_COLOR_BUFFER_BIT; 2589 glClear GL_COLOR_BUFFER_BIT;
2008 2590
2591 my $top = int $self->{children}[1]{range}[0];
2592
2593 my $y0 = $top;
2594 my $y1 = $top + $H;
2595
2596 my $y = 0;
2597
2598 my $layout = $self->{layout};
2599
2600 $layout->set_font ($self->{font}) if $self->{font};
2601
2009 glEnable GL_BLEND; 2602 glEnable GL_BLEND;
2603 #TODO# not correct in windows where rgba is forced off
2010 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2604 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 2605
2023 for my $par (@{$self->{par}}) { 2606 for my $par (@{$self->{par}}) {
2024 my $h = $par->[0]; 2607 my $h = $par->[1];
2025 2608
2026 if ($y0 < $y + $h && $y < $y1) { 2609 if ($y0 < $y + $h && $y < $y1) {
2610 $layout->set_foreground (@{ $par->[2] });
2611 $layout->set_width ($W - $par->[3]);
2027 $layout->set_text ($par->[2]); 2612 $layout->set_markup ($par->[4]);
2028 2613
2029 glColor @{ $par->[1] }; 2614 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2030 my ($W, $H) = $layout->size; 2615
2031 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2616 glRasterPos $par->[3], $y - $y0;
2617 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2032 } 2618 }
2033 2619
2034 $y += $h; 2620 $y += $h;
2035 } 2621 }
2036 2622
2037 glDisable GL_TEXTURE_2D;
2038 glDisable GL_BLEND; 2623 glDisable GL_BLEND;
2039 }; 2624 };
2040 }); 2625 });
2041} 2626}
2042 2627
2043sub _draw { 2628sub _draw {
2044 my ($self) = @_; 2629 my ($self) = @_;
2045 2630
2046 if ($self->{texture}) {
2047 glEnable GL_TEXTURE_2D; 2631 glEnable GL_TEXTURE_2D;
2048 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2632 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2049 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2633 glColor 0, 0, 0, 1;
2634 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2050 glDisable GL_TEXTURE_2D; 2635 glDisable GL_TEXTURE_2D;
2051 }
2052 2636
2053 $self->{children}[1]->draw; 2637 $self->{children}[1]->draw;
2054 2638
2055} 2639}
2056 2640
… …
2104 2688
2105sub new { 2689sub new {
2106 my $class = shift; 2690 my $class = shift;
2107 2691
2108 my $self = $class->SUPER::new ( 2692 my $self = $class->SUPER::new (
2109 state => 0, 2693 state => 0,
2110 connect_activate => \&toggle_flopper, 2694 on_activate => \&toggle_flopper,
2111 can_events => 1,
2112 @_ 2695 @_
2113 ); 2696 );
2114 2697
2115 if ($self->{state}) {
2116 $self->{state} = 0;
2117 $self->toggle_flopper;
2118 }
2119
2120 $self 2698 $self
2121} 2699}
2122 2700
2123sub toggle_flopper { 2701sub toggle_flopper {
2124 my ($self) = @_; 2702 my ($self) = @_;
2125 2703
2126 # TODO: use animation 2704 $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} 2705}
2138 2706
2139############################################################################# 2707#############################################################################
2140 2708
2141package CFClient::UI::Tooltip; 2709package CFClient::UI::Tooltip;
… …
2151 @_, 2719 @_,
2152 can_events => 0, 2720 can_events => 0,
2153 ) 2721 )
2154} 2722}
2155 2723
2156sub set_text { 2724sub set_tooltip_from {
2157 my ($self, $text) = @_; 2725 my ($self, $widget) = @_;
2158 2726
2159 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2727 my $tooltip = $widget->{tooltip};
2160 $self->{label}->set_text ($text); 2728
2161 $self->add ($self->{label}); 2729 if ($ENV{CFPLUS_DEBUG} & 2) {
2730 $tooltip .= "\n\n" . (ref $widget) . "\n"
2731 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2732 . "req $widget->{req_w} $widget->{req_h}\n"
2733 . "visible $widget->{visible}";
2734 }
2735
2736 $self->add (new CFClient::UI::Label
2737 markup => $tooltip,
2738 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2739 fontsize => 0.8,
2740 fg => [0, 0, 0, 1],
2741 ellipsise => 0,
2742 font => ($widget->{tooltip_font} || $::FONT_PROP),
2743 );
2162} 2744}
2163 2745
2164sub size_request { 2746sub size_request {
2165 my ($self) = @_; 2747 my ($self) = @_;
2166 2748
2167 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2749 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2168 2750
2169 $w = List::Util::min $::WIDTH * 0.2, $w;
2170 $h = List::Util::max $::HEIGHT * 0.2, $h;
2171
2172 ($w + 4, $h + 4) 2751 ($w + 4, $h + 4)
2173} 2752}
2174 2753
2754sub size_allocate {
2755 my ($self, $w, $h) = @_;
2756
2757 $self->SUPER::size_allocate ($w - 4, $h - 4);
2758}
2759
2760sub visibility_change {
2761 my ($self, $visible) = @_;
2762
2763 return unless $visible;
2764
2765 $self->{root}->on_post_alloc ("move_$self" => sub {
2766 my $widget = $self->{owner}
2767 or return;
2768
2769 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2770
2771 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2772 if $x + $self->{w} > $::WIDTH;
2773
2774 $self->move_abs ($x, $y);
2775 });
2776}
2777
2175sub _draw { 2778sub _draw {
2176 my ($self) = @_; 2779 my ($self) = @_;
2177 2780
2178 glPushMatrix;
2179 glTranslate 0.375, 0.375; 2781 glTranslate 0.375, 0.375;
2180 2782
2181 my ($w, $h) = @$self{qw(w h)}; 2783 my ($w, $h) = @$self{qw(w h)};
2182 2784
2183 glColor 1, 0.8, 0.4; 2785 glColor 1, 0.8, 0.4;
… …
2194 glVertex 0 , $h; 2796 glVertex 0 , $h;
2195 glVertex $w, $h; 2797 glVertex $w, $h;
2196 glVertex $w, 0; 2798 glVertex $w, 0;
2197 glEnd; 2799 glEnd;
2198 2800
2199 glPopMatrix; 2801 glTranslate 2 - 0.375, 2 - 0.375;
2200 2802
2201 glTranslate 2, 2;
2202 $self->SUPER::_draw; 2803 $self->SUPER::_draw;
2203} 2804}
2204 2805
2205############################################################################# 2806#############################################################################
2206 2807
2808package CFClient::UI::Face;
2809
2810our @ISA = CFClient::UI::Base::;
2811
2812use CFClient::OpenGL;
2813
2814sub new {
2815 my $class = shift;
2816
2817 my $self = $class->SUPER::new (
2818 aspect => 1,
2819 can_events => 0,
2820 @_,
2821 );
2822
2823 if ($self->{anim} && $self->{animspeed}) {
2824 Scalar::Util::weaken (my $widget = $self);
2825
2826 $self->{timer} = Event->timer (
2827 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2828 hard => 1,
2829 interval => $self->{animspeed},
2830 cb => sub {
2831 ++$widget->{frame};
2832 $widget->update;
2833 },
2834 );
2835 }
2836
2837 $self
2838}
2839
2840sub size_request {
2841 (32, 8)
2842}
2843
2844sub update {
2845 my ($self) = @_;
2846
2847 return unless $self->{visible};
2848
2849 $self->SUPER::update;
2850}
2851
2852sub _draw {
2853 my ($self) = @_;
2854
2855 return unless $::CONN;
2856
2857 my $face;
2858
2859 if ($self->{frame}) {
2860 my $anim = $::CONN->{anim}[$self->{anim}];
2861
2862 $face = $anim->[ $self->{frame} % @$anim ]
2863 if $anim && @$anim;
2864 }
2865
2866 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2867
2868 if ($tex) {
2869 glEnable GL_TEXTURE_2D;
2870 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2871 glColor 0, 0, 0, 1;
2872 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2873 glDisable GL_TEXTURE_2D;
2874 }
2875}
2876
2877sub DESTROY {
2878 my ($self) = @_;
2879
2880 $self->{timer}->cancel
2881 if $self->{timer};
2882
2883 $self->SUPER::DESTROY;
2884}
2885
2886#############################################################################
2887
2888package CFClient::UI::Buttonbar;
2889
2890our @ISA = CFClient::UI::HBox::;
2891
2892# TODO: should actualyl wrap buttons and other goodies.
2893
2894#############################################################################
2895
2896package CFClient::UI::Menu;
2897
2898our @ISA = CFClient::UI::FancyFrame::;
2899
2900use CFClient::OpenGL;
2901
2902sub new {
2903 my $class = shift;
2904
2905 my $self = $class->SUPER::new (
2906 items => [],
2907 z => 100,
2908 @_,
2909 );
2910
2911 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2912
2913 for my $item (@{ $self->{items} }) {
2914 my ($widget, $cb) = @$item;
2915
2916 # handle various types of items, only text for now
2917 if (!ref $widget) {
2918 $widget = new CFClient::UI::Label
2919 can_hover => 1,
2920 can_events => 1,
2921 text => $widget;
2922 }
2923
2924 $self->{item}{$widget} = $item;
2925
2926 $self->{vbox}->add ($widget);
2927 }
2928
2929 $self
2930}
2931
2932# popup given the event (must be a mouse button down event currently)
2933sub popup {
2934 my ($self, $ev) = @_;
2935
2936 $self->_emit ("popdown");
2937
2938 # maybe save $GRAB? must be careful about events...
2939 $GRAB = $self;
2940 $self->{button} = $ev->{button};
2941
2942 $self->show;
2943 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2944}
2945
2946sub mouse_motion {
2947 my ($self, $ev, $x, $y) = @_;
2948
2949 # TODO: should use vbox->find_widget or so
2950 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2951 $self->{hover} = $self->{item}{$HOVER};
2952
2953 0
2954}
2955
2956sub button_up {
2957 my ($self, $ev, $x, $y) = @_;
2958
2959 if ($ev->{button} == $self->{button}) {
2960 undef $GRAB;
2961 $self->hide;
2962
2963 $self->_emit ("popdown");
2964 $self->{hover}[1]->() if $self->{hover};
2965 } else {
2966 return 0
2967 }
2968
2969 1
2970}
2971
2972#############################################################################
2973
2974package CFClient::UI::Multiplexer;
2975
2976our @ISA = CFClient::UI::Container::;
2977
2978sub new {
2979 my $class = shift;
2980
2981 my $self = $class->SUPER::new (
2982 @_,
2983 );
2984
2985 $self->{current} = $self->{children}[0]
2986 if @{ $self->{children} };
2987
2988 $self
2989}
2990
2991sub add {
2992 my ($self, @widgets) = @_;
2993
2994 $self->SUPER::add (@widgets);
2995
2996 $self->{current} = $self->{children}[0]
2997 if @{ $self->{children} };
2998}
2999
3000sub set_current_page {
3001 my ($self, $page_or_widget) = @_;
3002
3003 my $widget = ref $page_or_widget
3004 ? $page_or_widget
3005 : $self->{children}[$page_or_widget];
3006
3007 $self->{current} = $widget;
3008 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3009
3010 $self->_emit (page_changed => $self->{current});
3011
3012 $self->realloc;
3013}
3014
3015sub visible_children {
3016 $_[0]{current}
3017}
3018
3019sub size_request {
3020 my ($self) = @_;
3021
3022 $self->{current}->size_request
3023}
3024
3025sub size_allocate {
3026 my ($self, $w, $h) = @_;
3027
3028 $self->{current}->configure (0, 0, $w, $h);
3029}
3030
3031sub _draw {
3032 my ($self) = @_;
3033
3034 $self->{current}->draw;
3035}
3036
3037#############################################################################
3038
3039package CFClient::UI::Notebook;
3040
3041our @ISA = CFClient::UI::VBox::;
3042
3043sub new {
3044 my $class = shift;
3045
3046 my $self = $class->SUPER::new (
3047 buttonbar => (new CFClient::UI::Buttonbar),
3048 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3049 # filter => # will be put between multiplexer and $self
3050 @_,
3051 );
3052
3053 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3054 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3055
3056 $self
3057}
3058
3059sub add {
3060 my ($self, $title, $widget, $tooltip) = @_;
3061
3062 Scalar::Util::weaken $self;
3063
3064 $self->{buttonbar}->add (new CFClient::UI::Button
3065 markup => $title,
3066 tooltip => $tooltip,
3067 on_activate => sub { $self->set_current_page ($widget) },
3068 );
3069
3070 $self->{multiplexer}->add ($widget);
3071}
3072
3073sub set_current_page {
3074 my ($self, $page) = @_;
3075
3076 $self->{multiplexer}->set_current_page ($page);
3077 $self->_emit (page_changed => $self->{multiplexer}{current});
3078}
3079
3080#############################################################################
3081
3082package CFClient::UI::Statusbox;
3083
3084our @ISA = CFClient::UI::VBox::;
3085
3086sub new {
3087 my $class = shift;
3088
3089 my $self = $class->SUPER::new (
3090 fontsize => 0.8,
3091 @_,
3092 );
3093
3094 Scalar::Util::weaken (my $this = $self);
3095
3096 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3097
3098 $self
3099}
3100
3101sub reorder {
3102 my ($self) = @_;
3103 my $NOW = Time::HiRes::time;
3104
3105 # freeze display when hovering over any label
3106 return if $CFClient::UI::TOOLTIP->{owner}
3107 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3108 values %{ $self->{item} };
3109
3110 while (my ($k, $v) = each %{ $self->{item} }) {
3111 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3112 }
3113
3114 my @widgets;
3115
3116 my @items = sort {
3117 $a->{pri} <=> $b->{pri}
3118 or $b->{id} <=> $a->{id}
3119 } values %{ $self->{item} };
3120
3121 $self->{timer}->interval (1);
3122
3123 my $count = 10 + 1;
3124 for my $item (@items) {
3125 last unless --$count;
3126
3127 my $label = $item->{label} ||= do {
3128 # TODO: doesn't handle markup well (read as: at all)
3129 my $short = $item->{count} > 1
3130 ? "<b>$item->{count} ×</b> $item->{text}"
3131 : $item->{text};
3132
3133 for ($short) {
3134 s/^\s+//;
3135 s/\s+/ /g;
3136 }
3137
3138 new CFClient::UI::Label
3139 markup => $short,
3140 tooltip => $item->{tooltip},
3141 tooltip_font => $::FONT_PROP,
3142 tooltip_width => 0.67,
3143 fontsize => $item->{fontsize} || $self->{fontsize},
3144 max_w => $::WIDTH * 0.44,
3145 fg => [@{ $item->{fg} }],
3146 can_events => 1,
3147 can_hover => 1
3148 };
3149
3150 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3151 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3152 $label->update;
3153 $label->set_max_size (undef, $label->{req_h} * $diff)
3154 if $diff < 1;
3155 $self->{timer}->interval (1/30);
3156 } else {
3157 $label->{fg}[3] = $item->{fg}[3] || 1;
3158 }
3159
3160 push @widgets, $label;
3161 }
3162
3163 $self->clear;
3164 $self->SUPER::add (reverse @widgets);
3165}
3166
3167sub add {
3168 my ($self, $text, %arg) = @_;
3169
3170 $text =~ s/^\s+//;
3171 $text =~ s/\s+$//;
3172
3173 return unless $text;
3174
3175 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3176
3177 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3178
3179 if (my $item = $self->{item}{$group}) {
3180 if ($item->{text} eq $text) {
3181 $item->{count}++;
3182 } else {
3183 $item->{count} = 1;
3184 $item->{text} = $item->{tooltip} = $text;
3185 }
3186 $item->{id} = ++$self->{id};
3187 $item->{timeout} = $timeout;
3188 delete $item->{label};
3189 } else {
3190 $self->{item}{$group} = {
3191 id => ++$self->{id},
3192 text => $text,
3193 timeout => $timeout,
3194 tooltip => $text,
3195 fg => [0.8, 0.8, 0.8, 0.8],
3196 pri => 0,
3197 count => 1,
3198 %arg,
3199 };
3200 }
3201
3202 $self->reorder;
3203}
3204
3205sub reconfigure {
3206 my ($self) = @_;
3207
3208 delete $_->{label}
3209 for values %{ $self->{item} || {} };
3210
3211 $self->reorder;
3212 $self->SUPER::reconfigure;
3213}
3214
3215sub DESTROY {
3216 my ($self) = @_;
3217
3218 $self->{timer}->cancel;
3219
3220 $self->SUPER::DESTROY;
3221}
3222
3223#############################################################################
3224
3225package CFClient::UI::Inventory;
3226
3227our @ISA = CFClient::UI::ScrolledWindow::;
3228
3229sub new {
3230 my $class = shift;
3231
3232 my $self = $class->SUPER::new (
3233 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3234 @_,
3235 );
3236
3237 $self
3238}
3239
3240sub set_items {
3241 my ($self, $items) = @_;
3242
3243 $self->{child}->clear;
3244 return unless $items;
3245
3246 my @items = sort {
3247 ($a->{type} <=> $b->{type})
3248 or ($a->{name} cmp $b->{name})
3249 } @$items;
3250
3251 $self->{real_items} = \@items;
3252
3253 my $row = 0;
3254 for my $item (@items) {
3255 CFClient::Item::update_widgets $item;
3256
3257 $self->{child}->add (0, $row, $item->{face_widget});
3258 $self->{child}->add (1, $row, $item->{desc_widget});
3259 $self->{child}->add (2, $row, $item->{weight_widget});
3260
3261 $row++;
3262 }
3263}
3264
3265#############################################################################
3266
3267package CFClient::UI::BindEditor;
3268
3269our @ISA = CFClient::UI::FancyFrame::;
3270
3271sub new {
3272 my $class = shift;
3273
3274 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3275
3276 $self->add (my $vb = new CFClient::UI::VBox);
3277
3278
3279 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3280 text => "start recording",
3281 tooltip => "Start/Stops recording of actions."
3282 ."All subsequent actions after the recording started will be captured."
3283 ."The actions are displayed after the record was stopped."
3284 ."To bind the action you have to click on the 'Bind' button",
3285 on_activate => sub {
3286 unless ($self->{recording}) {
3287 $self->start;
3288 } else {
3289 $self->stop;
3290 }
3291 });
3292
3293 $vb->add (new CFClient::UI::Label text => "Actions:");
3294 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3295
3296 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3297 $vb->add (my $hb = new CFClient::UI::HBox);
3298 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3299 $hb->add (new CFClient::UI::Button
3300 text => "bind",
3301 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3302 on_activate => sub {
3303 $self->ask_for_bind;
3304 });
3305
3306 $vb->add (my $hb = new CFClient::UI::HBox);
3307 $hb->add (new CFClient::UI::Button
3308 text => "ok",
3309 expand => 1,
3310 tooltip => "This closes the binding editor and saves the binding",
3311 on_activate => sub {
3312 $self->hide;
3313 $self->commit;
3314 });
3315
3316 $hb->add (new CFClient::UI::Button
3317 text => "cancel",
3318 expand => 1,
3319 tooltip => "This closes the binding editor without saving",
3320 on_activate => sub {
3321 $self->hide;
3322 $self->{binding_cancel}->()
3323 if $self->{binding_cancel};
3324 });
3325
3326 $self->update_binding_widgets;
3327
3328 $self
3329}
3330
3331sub commit {
3332 my ($self) = @_;
3333 my ($mod, $sym, $cmds) = $self->get_binding;
3334 if ($sym != 0 && @$cmds > 0) {
3335 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3336 ."'. Don't forget 'Save Config'!");
3337 $self->{binding_change}->($mod, $sym, $cmds)
3338 if $self->{binding_change};
3339 } else {
3340 $::STATUSBOX->add ("No action bound, no key or action specified!");
3341 $self->{binding_cancel}->()
3342 if $self->{binding_cancel};
3343 }
3344}
3345
3346sub start {
3347 my ($self) = @_;
3348
3349 $self->{rec_btn}->set_text ("stop recording");
3350 $self->{recording} = 1;
3351 $self->clear_command_list;
3352 $::CONN->start_record if $::CONN;
3353}
3354
3355sub stop {
3356 my ($self) = @_;
3357
3358 $self->{rec_btn}->set_text ("start recording");
3359 $self->{recording} = 0;
3360
3361 my $rec;
3362 $rec = $::CONN->stop_record if $::CONN;
3363 return unless ref $rec eq 'ARRAY';
3364 $self->set_command_list ($rec);
3365}
3366
3367
3368sub ask_for_bind_and_commit {
3369 my ($self) = @_;
3370 $self->ask_for_bind (1);
3371}
3372
3373sub ask_for_bind {
3374 my ($self, $commit) = @_;
3375
3376 CFClient::Binder::open_binding_dialog (sub {
3377 my ($mod, $sym) = @_;
3378 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3379 $self->update_binding_widgets;
3380 $self->commit if $commit;
3381 });
3382}
3383
3384# $mod and $sym are the modifiers and key symbol
3385# $cmds is a array ref of strings (the commands)
3386# $cb is the callback that is executed on OK
3387# $ccb is the callback that is executed on CANCEL and
3388# when the binding was unsuccessful on OK
3389sub set_binding {
3390 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3391
3392 $self->clear_command_list;
3393 $self->{recording} = 0;
3394 $self->{rec_btn}->set_text ("start recording");
3395
3396 $self->{binding} = [$mod, $sym];
3397 $self->{commands} = $cmds;
3398
3399 $self->{binding_change} = $cb;
3400 $self->{binding_cancel} = $ccb;
3401
3402 $self->update_binding_widgets;
3403}
3404
3405# this is a shortcut method that asks for a binding
3406# and then just binds it.
3407sub do_quick_binding {
3408 my ($self, $cmds) = @_;
3409 $self->set_binding (undef, undef, $cmds, sub {
3410 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3411 });
3412 $self->ask_for_bind (1);
3413}
3414
3415sub update_binding_widgets {
3416 my ($self) = @_;
3417 my ($mod, $sym, $cmds) = $self->get_binding;
3418 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3419 $self->set_command_list ($cmds);
3420}
3421
3422sub get_binding {
3423 my ($self) = @_;
3424 return (
3425 $self->{binding}->[0],
3426 $self->{binding}->[1],
3427 [ grep { defined $_ } @{$self->{commands}} ]
3428 );
3429}
3430
3431sub clear_command_list {
3432 my ($self) = @_;
3433 $self->{cmdbox}->clear ();
3434}
3435
3436sub set_command_list {
3437 my ($self, $cmds) = @_;
3438
3439 $self->{cmdbox}->clear ();
3440 $self->{commands} = $cmds;
3441
3442 my $idx = 0;
3443
3444 for (@$cmds) {
3445 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3446
3447 my $i = $idx;
3448 $hb->add (new CFClient::UI::Label text => $_);
3449 $hb->add (new CFClient::UI::Button
3450 text => "delete",
3451 tooltip => "Deletes the action from the record",
3452 on_activate => sub {
3453 $self->{cmdbox}->remove ($hb);
3454 $cmds->[$i] = undef;
3455 });
3456
3457
3458 $idx++
3459 }
3460}
3461
3462#############################################################################
3463
3464package CFClient::UI::SpellList;
3465
3466our @ISA = CFClient::UI::Table::;
3467
3468sub new {
3469 my $class = shift;
3470
3471 my $self = $class->SUPER::new (
3472 binding => [],
3473 commands => [],
3474 @_,
3475 )
3476}
3477
3478# XXX: Do sorting? Argl...
3479sub add_spell {
3480 my ($self, $spell) = @_;
3481 $self->{spells}->{$spell->{name}} = $spell;
3482
3483 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3484 face => $spell->{face},
3485 can_hover => 1,
3486 can_events => 1,
3487 tooltip => $spell->{message});
3488
3489 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3490 text => $spell->{name},
3491 can_hover => 1,
3492 can_events => 1,
3493 tooltip => $spell->{message},
3494 expand => 1);
3495
3496 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3497 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3498 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3499 expand => 1);
3500
3501 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3502 text => "bind to key",
3503 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3504}
3505
3506sub rebuild_spell_list {
3507 my ($self) = @_;
3508 $self->{tbl_idx} = 0;
3509 $self->add_spell ($_) for values %{$self->{spells}};
3510}
3511
3512sub remove_spell {
3513 my ($self, $spell) = @_;
3514 delete $self->{spells}->{$spell->{name}};
3515 $self->rebuild_spell_list;
3516}
3517
3518#############################################################################
3519
2207package CFClient::UI::Root; 3520package CFClient::UI::Root;
2208 3521
2209our @ISA = CFClient::UI::Container::; 3522our @ISA = CFClient::UI::Container::;
2210 3523
3524use List::Util qw(min max);
3525
2211use CFClient::OpenGL; 3526use CFClient::OpenGL;
2212 3527
2213sub check_size { 3528sub new {
2214 my ($self) = @_; 3529 my $class = shift;
2215 3530
2216 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 3531 my $self = $class->SUPER::new (
3532 visible => 1,
3533 @_,
3534 );
3535
3536 Scalar::Util::weaken ($self->{root} = $self);
3537
3538 $self
2217} 3539}
2218 3540
2219sub size_request { 3541sub size_request {
2220 ($::WIDTH, $::HEIGHT) 3542 my ($self) = @_;
2221}
2222 3543
2223sub configure { 3544 ($self->{w}, $self->{h})
3545}
3546
3547sub _to_pixel {
3548 my ($coord, $size, $max) = @_;
3549
3550 $coord =
3551 $coord eq "center" ? ($max - $size) * 0.5
3552 : $coord eq "max" ? $max
3553 : $coord;
3554
3555 $coord = 0 if $coord < 0;
3556 $coord = $max - $size if $coord > $max - $size;
3557
3558 int $coord + 0.5
3559}
3560
3561sub size_allocate {
2224 my ($self, $x, $y, $w, $h) = @_; 3562 my ($self, $w, $h) = @_;
2225 3563
2226 $self->SUPER::configure ($x, $y, $w, $h);
2227
2228 for my $child (@{$self->{children}}) { 3564 for my $child ($self->children) {
2229 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3565 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2230 3566
2231 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3567 $X = $child->{force_x} if exists $child->{force_x};
2232 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3568 $Y = $child->{force_y} if exists $child->{force_y};
3569
3570 $X = _to_pixel $X, $W, $self->{w};
3571 $Y = _to_pixel $Y, $H, $self->{h};
3572
2233 $child->configure ($X, $Y, $W,$H); 3573 $child->configure ($X, $Y, $W, $H);
2234 } 3574 }
2235} 3575}
2236 3576
2237sub _topleft { 3577sub coord2local {
2238 my ($self, $x, $y) = @_; 3578 my ($self, $x, $y) = @_;
2239 3579
2240 ($x, $y) 3580 ($x, $y)
2241} 3581}
2242 3582
3583sub coord2global {
3584 my ($self, $x, $y) = @_;
3585
3586 ($x, $y)
3587}
3588
2243sub update { 3589sub update {
2244 my ($self) = @_; 3590 my ($self) = @_;
2245 3591
2246 $self->check_size; 3592 $::WANT_REFRESH++;
2247 ::refresh ();
2248} 3593}
2249 3594
2250sub add { 3595sub add {
2251 my ($self, $child) = @_; 3596 my ($self, @children) = @_;
2252 3597
2253 # integerize window positions 3598 $_->{is_toplevel} = 1
2254 $child->{x} = int $child->{x}; 3599 for @children;
2255 $child->{y} = int $child->{y};
2256 3600
2257 $self->SUPER::add ($child); 3601 $self->SUPER::add (@children);
3602}
3603
3604sub remove {
3605 my ($self, @children) = @_;
3606
3607 $self->SUPER::remove (@children);
3608
3609 delete $self->{is_toplevel}
3610 for @children;
3611
3612 while (@children) {
3613 my $w = pop @children;
3614 push @children, $w->children;
3615 $w->set_invisible;
3616 }
2258} 3617}
2259 3618
2260sub on_refresh { 3619sub on_refresh {
2261 my ($self, $id, $cb) = @_; 3620 my ($self, $id, $cb) = @_;
2262 3621
2263 $self->{refresh_hook}{$id} = $cb; 3622 $self->{refresh_hook}{$id} = $cb;
2264} 3623}
2265 3624
3625sub on_post_alloc {
3626 my ($self, $id, $cb) = @_;
3627
3628 $self->{post_alloc_hook}{$id} = $cb;
3629}
3630
2266sub draw { 3631sub draw {
2267 my ($self) = @_; 3632 my ($self) = @_;
2268 3633
2269 while (my $rcb = delete $self->{refresh_hook}) { 3634 while ($self->{refresh_hook}) {
2270 $_->() for values %$rcb; 3635 $_->()
3636 for values %{delete $self->{refresh_hook}};
2271 } 3637 }
3638
3639 if ($self->{realloc}) {
3640 my %queue;
3641 my @queue;
3642 my $widget;
3643
3644 outer:
3645 while () {
3646 if (my $realloc = delete $self->{realloc}) {
3647 for $widget (values %$realloc) {
3648 $widget->{visible} or next; # do not resize invisible widgets
3649
3650 $queue{$widget+0}++ and next; # duplicates are common
3651
3652 push @{ $queue[$widget->{visible}] }, $widget;
3653 }
3654 }
3655
3656 while () {
3657 @queue or last outer;
3658
3659 $widget = pop @{ $queue[-1] || [] }
3660 and last;
3661
3662 pop @queue;
3663 }
3664
3665 delete $queue{$widget+0};
3666
3667 my ($w, $h) = $widget->size_request;
3668
3669 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3670 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3671
3672 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3673 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3674
3675 $w = $widget->{force_w} if exists $widget->{force_w};
3676 $h = $widget->{force_h} if exists $widget->{force_h};
3677
3678 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3679 || delete $widget->{force_realloc}) {
3680 $widget->{req_w} = $w;
3681 $widget->{req_h} = $h;
3682
3683 $self->{size_alloc}{$widget+0} = $widget;
3684
3685 if (my $parent = $widget->{parent}) {
3686 $self->{realloc}{$parent+0} = $parent
3687 unless $queue{$parent+0};
3688
3689 $parent->{force_size_alloc} = 1;
3690 $self->{size_alloc}{$parent+0} = $parent;
3691 }
3692 }
3693
3694 delete $self->{realloc}{$widget+0};
3695 }
3696 }
3697
3698 while (my $size_alloc = delete $self->{size_alloc}) {
3699 my @queue = sort { $b->{visible} <=> $a->{visible} }
3700 values %$size_alloc;
3701
3702 while () {
3703 my $widget = pop @queue || last;
3704
3705 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3706
3707 $w = 0 if $w < 0;
3708 $h = 0 if $h < 0;
3709
3710 $w = int $w + 0.5;
3711 $h = int $h + 0.5;
3712
3713 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3714 $widget->{old_w} = $widget->{w};
3715 $widget->{old_h} = $widget->{h};
3716
3717 $widget->{w} = $w;
3718 $widget->{h} = $h;
3719
3720 $widget->emit (size_allocate => $w, $h);
3721 }
3722 }
3723 }
3724
3725 while ($self->{post_alloc_hook}) {
3726 $_->()
3727 for values %{delete $self->{post_alloc_hook}};
3728 }
3729
2272 3730
2273 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3731 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2274 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3732 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2275 glClear GL_COLOR_BUFFER_BIT; 3733 glClear GL_COLOR_BUFFER_BIT;
2276 3734
2277 glMatrixMode GL_PROJECTION; 3735 glMatrixMode GL_PROJECTION;
2278 glLoadIdentity; 3736 glLoadIdentity;
2279 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3737 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2280 glMatrixMode GL_MODELVIEW; 3738 glMatrixMode GL_MODELVIEW;
2281 glLoadIdentity; 3739 glLoadIdentity;
2282 3740
3741 {
3742 package CFClient::UI::Base;
3743
3744 ($draw_x, $draw_y, $draw_w, $draw_h) =
3745 (0, 0, $self->{w}, $self->{h});
3746 }
3747
2283 $self->_draw; 3748 $self->_draw;
2284} 3749}
2285 3750
2286############################################################################# 3751#############################################################################
2287 3752
2288package CFClient::UI; 3753package CFClient::UI;
2289 3754
2290$ROOT = new CFClient::UI::Root; 3755$ROOT = new CFClient::UI::Root;
2291$TOOLTIP = new CFClient::UI::Tooltip; 3756$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2292 3757
22931 37581
2294 3759

Diff Legend

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