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

Diff Legend

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