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

Diff Legend

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