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.203 by root, Sun May 14 21:13:11 2006 UTC vs.
Revision 1.304 by elmex, Tue Jun 13 11:01:04 2006 UTC

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

Diff Legend

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