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.189 by root, Mon May 8 22:17:24 2006 UTC vs.
Revision 1.290 by root, Mon Jun 5 22:30:35 2006 UTC

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

Diff Legend

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