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.212 by elmex, Wed May 17 14:55:14 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 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
146 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
147 $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.]+$/;
148 $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};
149 $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};
150 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
151 $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.]+$/;
152 $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};
153 $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};
154 $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
155 } 190 }
156
157 $widget->reconfigure;
158 } 191 }
192
193 reconfigure_widgets;
159} 194}
160 195
161############################################################################# 196#############################################################################
162 197
163package CFClient::UI::Base; 198package CFClient::UI::Base;
… …
168 203
169sub new { 204sub new {
170 my $class = shift; 205 my $class = shift;
171 206
172 my $self = bless { 207 my $self = bless {
173 x => 0, 208 x => "center",
174 y => 0, 209 y => "center",
175 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
176 can_events => 1, 213 can_events => 1,
177 @_ 214 @_
178 }, $class; 215 }, $class;
179 216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
218
180 for (keys %$self) { 219 for (keys %$self) {
181 if (/^connect_(.*)$/) { 220 if (/^on_(.*)$/) {
182 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
183 } 222 }
184 } 223 }
185 224
186 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 }
187 236
188 $self 237 $self
189} 238}
190 239
191sub destroy { 240sub destroy {
… …
201 return if $self->{parent}; 250 return if $self->{parent};
202 251
203 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
204} 253}
205 254
206sub hide { 255sub set_visible {
207 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};
208 279
209 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
210 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
211 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
212 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
213 if $self->{parent}; 313 if $self->{parent};
214} 314}
215 315
216sub move { 316sub move_abs {
217 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
218 318
219 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
220 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
221 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
222 322
223 $self->update; 323 $self->update;
224} 324}
225 325
226sub set_size { 326sub set_size {
227 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
228 328
229 $self->{user_w} = $w; 329 $self->{force_w} = $w;
230 $self->{user_h} = $h; 330 $self->{force_h} = $h;
231 331
232 $self->check_size; 332 $self->realloc;
233} 333}
234 334
235sub size_request { 335sub size_request {
236 require Carp; 336 require Carp;
237 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
238} 338}
239 339
340sub baseline_shift {
341 0
342}
343
240sub configure { 344sub configure {
241 my ($self, $x, $y, $w, $h) = @_; 345 my ($self, $x, $y, $w, $h) = @_;
242 346
243 if ($self->{aspect}) { 347 if ($self->{aspect}) {
348 my ($ow, $oh) = ($w, $h);
349
244 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 350 $w = List::Util::min $w, int $h * $self->{aspect};
245 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 351 $h = List::Util::min $h, int $w / $self->{aspect};
246 352
247 # use alignment to adjust x, y 353 # use alignment to adjust x, y
248 354
249 $x += int +($w - $w2) * 0.5; 355 $x += int 0.5 * ($ow - $w);
250 $y += int +($h - $h2) * 0.5; 356 $y += int 0.5 * ($oh - $h);
251
252 ($w, $h) = ($w2, $h2);
253 } 357 }
254 358
255 if ($self->{x} != $x || $self->{y} != $y) { 359 if ($self->{x} ne $x || $self->{y} ne $y) {
256 $self->{x} = $x; 360 $self->{x} = $x;
257 $self->{y} = $y; 361 $self->{y} = $y;
258 $self->update; 362 $self->update;
259 } 363 }
260 364
261 if ($self->{w} != $w || $self->{h} != $h) { 365 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
262 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 366 return unless $self->{visible};
263 }
264}
265 367
266sub size_allocate { 368 $self->{alloc_w} = $w;
267 # nothing to be done 369 $self->{alloc_h} = $h;
268}
269 370
270sub reconfigure { 371 $self->{root}{size_alloc}{$self+0} = $self;
271 my ($self) = @_; 372 }
272
273 $self->check_size (1);
274 $self->update;
275} 373}
276 374
277sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
278} 381}
279 382
280sub set_max_size { 383sub set_max_size {
281 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
282 385
283 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 $self->{max_w} = int $w if defined $w;
284 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 $self->{max_h} = int $h if defined $h;
388
389 $self->realloc;
285} 390}
286 391
287sub set_tooltip { 392sub set_tooltip {
288 my ($self, $tooltip) = @_; 393 my ($self, $tooltip) = @_;
289 394
395 $tooltip =~ s/^\s+//;
396 $tooltip =~ s/\s+$//;
397
398 return if $self->{tooltip} eq $tooltip;
399
290 $self->{tooltip} = $tooltip; 400 $self->{tooltip} = $tooltip;
291 401
292 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 402 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
293 delete $CFClient::UI::TOOLTIP->{owner}; 403 delete $CFClient::UI::TOOLTIP->{owner};
294 CFClient::UI::check_tooltip; 404 $CFClient::UI::TOOLTIP_WATCHER->cb->();
295 } 405 }
296} 406}
297 407
298# translate global coordinates to local coordinate system 408# translate global coordinates to local coordinate system
299sub coord2local { 409sub coord2local {
… …
307 my ($self, $x, $y) = @_; 417 my ($self, $x, $y) = @_;
308 418
309 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
310} 420}
311 421
312sub focus_in { 422sub invoke_focus_in {
313 my ($self) = @_; 423 my ($self) = @_;
314 424
315 return if $FOCUS == $self; 425 return if $FOCUS == $self;
316 return unless $self->{can_focus}; 426 return unless $self->{can_focus};
317 427
318 my $focus = $FOCUS; $FOCUS = $self; 428 $FOCUS = $self;
319 429
320 $self->emit (focus_in => $focus); 430 $self->update;
321 431
322 $focus->update if $focus; 432 0
323 $FOCUS->update;
324} 433}
325 434
326sub focus_out { 435sub invoke_focus_out {
327 my ($self) = @_; 436 my ($self) = @_;
328 437
329 return unless $FOCUS == $self; 438 return unless $FOCUS == $self;
330 439
331 my $focus = $FOCUS; undef $FOCUS; 440 undef $FOCUS;
332 441
333 $self->emit (focus_out => $focus); 442 $self->update;
334 443
335 $focus->update if $focus; #? 444 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
336} 445 unless $FOCUS;
337 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
338sub mouse_motion { } 457sub invoke_mouse_motion { 0 }
339sub button_up { } 458sub invoke_button_up { 0 }
340sub key_down { } 459sub invoke_key_down { 0 }
341sub key_up { } 460sub invoke_key_up { 0 }
342 461
343sub button_down { 462sub invoke_button_down {
344 my ($self, $ev, $x, $y) = @_; 463 my ($self, $ev, $x, $y) = @_;
345 464
346 $self->focus_in; 465 $self->grab_focus;
347}
348 466
349sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 467 0
350sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 468}
351sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 469
352sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 470sub connect {
353sub 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
354 537
355sub draw { 538sub draw {
356 my ($self) = @_; 539 my ($self) = @_;
357 540
358 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);
359 550
360 glPushMatrix; 551 glPushMatrix;
361 glTranslate $self->{x}, $self->{y}, 0; 552 glTranslate $self->{x}, $self->{y}, 0;
362 $self->_draw;
363 glPopMatrix;
364 553
365 if ($self == $HOVER && $self->{can_hover}) { 554 if ($self == $HOVER && $self->{can_hover}) {
366 my ($x, $y) = @$self{qw(x y)};
367
368 glColor 1, 0.8, 0.5, 0.2; 555 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
369 glEnable GL_BLEND; 556 glEnable GL_BLEND;
370 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 557 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
371 glBegin GL_QUADS; 558 glBegin GL_QUADS;
372 glVertex $x , $y;
373 glVertex $x + $self->{w}, $y;
374 glVertex $x + $self->{w}, $y + $self->{h};
375 glVertex $x , $y + $self->{h};
376 glEnd;
377 glDisable GL_BLEND;
378 }
379
380 if ($ENV{PCLIENT_DEBUG}) {
381 glPushMatrix;
382 glColor 1, 1, 0, 1;
383 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
384 glBegin GL_LINE_LOOP;
385 glVertex 0 , 0; 559 glVertex 0 , 0;
386 glVertex $self->{w}, 0; 560 glVertex $self->{w}, 0;
387 glVertex $self->{w}, $self->{h}; 561 glVertex $self->{w}, $self->{h};
388 glVertex 0 , $self->{h}; 562 glVertex 0 , $self->{h};
389 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;
390 glPopMatrix; 577 glPopMatrix;
391 #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;
392 } 579 }
580
581 $self->_draw;
582 glPopMatrix;
393} 583}
394 584
395sub _draw { 585sub _draw {
396 my ($self) = @_; 586 my ($self) = @_;
397 587
398 warn "no draw defined for $self\n"; 588 warn "no draw defined for $self\n";
399} 589}
400 590
401sub find_widget {
402 my ($self, $x, $y) = @_;
403
404 return () unless $self->{can_events};
405
406 return $self
407 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
408 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
409
410 ()
411}
412
413sub set_parent {
414 my ($self, $parent) = @_;
415
416 Scalar::Util::weaken ($self->{parent} = $parent);
417
418 # TODO: req_w _does_change after ->reconfigure
419 $self->check_size
420 unless exists $self->{req_w};
421}
422
423sub check_size {
424 my ($self, $forced) = @_;
425
426 $self->{force_alloc} = 1 if $forced;
427 $CFClient::UI::ROOT->{check_size}{$self} = $self;
428}
429
430sub update {
431 my ($self) = @_;
432
433 $self->{parent}->update
434 if $self->{parent};
435}
436
437sub connect {
438 my ($self, $signal, $cb) = @_;
439
440 push @{ $self->{signal_cb}{$signal} }, $cb;
441}
442
443sub emit {
444 my ($self, $signal, @args) = @_;
445
446 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
447}
448
449sub DESTROY { 591sub DESTROY {
450 my ($self) = @_; 592 my ($self) = @_;
451 593
594 return if CFClient::in_destruct;
595
452 delete $WIDGET{$self+0}; 596 delete $WIDGET{$self+0};
453 #$self->deactivate; 597
598 eval { $self->destroy };
599 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
454} 600}
455 601
456############################################################################# 602#############################################################################
457 603
458package CFClient::UI::DrawBG; 604package CFClient::UI::DrawBG;
… …
483 629
484 if ($color && (@$color < 4 || $color->[3])) { 630 if ($color && (@$color < 4 || $color->[3])) {
485 my ($w, $h) = @$self{qw(w h)}; 631 my ($w, $h) = @$self{qw(w h)};
486 632
487 glEnable GL_BLEND; 633 glEnable GL_BLEND;
488 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 634 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
489 glColor @$color; 635 glColor_premultiply @$color;
490 636
491 glBegin GL_QUADS; 637 glBegin GL_QUADS;
492 glVertex 0 , 0; 638 glVertex 0 , 0;
493 glVertex 0 , $h; 639 glVertex 0 , $h;
494 glVertex $w, $h; 640 glVertex $w, $h;
… …
509 my ($class, %arg) = @_; 655 my ($class, %arg) = @_;
510 $class->SUPER::new (can_events => 0, %arg); 656 $class->SUPER::new (can_events => 0, %arg);
511} 657}
512 658
513sub size_request { 659sub size_request {
514 (0, 0) 660 my ($self) = @_;
661
662 ($self->{w} + 0, $self->{h} + 0)
515} 663}
516 664
517sub draw { } 665sub draw { }
518 666
519############################################################################# 667#############################################################################
… …
523our @ISA = CFClient::UI::Base::; 671our @ISA = CFClient::UI::Base::;
524 672
525sub new { 673sub new {
526 my ($class, %arg) = @_; 674 my ($class, %arg) = @_;
527 675
528 my $children = delete $arg{children} || []; 676 my $children = delete $arg{children};
529 677
530 my $self = $class->SUPER::new ( 678 my $self = $class->SUPER::new (
531 children => [], 679 children => [],
532 can_events => 0, 680 can_events => 0,
533 %arg, 681 %arg,
534 ); 682 );
683
535 $self->add ($_) for @$children; 684 $self->add (@$children)
685 if $children;
536 686
537 $self 687 $self
538} 688}
539 689
540sub add { 690sub add {
… …
548 $self->{children} = [ 698 $self->{children} = [
549 sort { $a->{z} <=> $b->{z} } 699 sort { $a->{z} <=> $b->{z} }
550 @{$self->{children}}, @widgets 700 @{$self->{children}}, @widgets
551 ]; 701 ];
552 702
553 $self->check_size (1); 703 $self->realloc;
554 $self->update;
555} 704}
556 705
557sub children { 706sub children {
558 @{ $_[0]{children} } 707 @{ $_[0]{children} }
559} 708}
… …
564 delete $child->{parent}; 713 delete $child->{parent};
565 $child->hide; 714 $child->hide;
566 715
567 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 716 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
568 717
569 $self->check_size; 718 $self->realloc;
570 $self->update;
571} 719}
572 720
573sub clear { 721sub clear {
574 my ($self) = @_; 722 my ($self) = @_;
575 723
… …
579 for (@$children) { 727 for (@$children) {
580 delete $_->{parent}; 728 delete $_->{parent};
581 $_->hide; 729 $_->hide;
582 } 730 }
583 731
584 $self->check_size; 732 $self->realloc;
585 $self->update;
586} 733}
587 734
588sub find_widget { 735sub find_widget {
589 my ($self, $x, $y) = @_; 736 my ($self, $x, $y) = @_;
590 737
591 $x -= $self->{x}; 738 $x -= $self->{x};
592 $y -= $self->{y}; 739 $y -= $self->{y};
593 740
594 my $res; 741 my $res;
595 742
596 for (reverse @{ $self->{children} }) { 743 for (reverse $self->visible_children) {
597 $res = $_->find_widget ($x, $y) 744 $res = $_->find_widget ($x, $y)
598 and return $res; 745 and return $res;
599 } 746 }
600 747
601 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 748 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
622} 769}
623 770
624sub add { 771sub add {
625 my ($self, $child) = @_; 772 my ($self, $child) = @_;
626 773
627 $self->{children} = []; 774 $self->SUPER::remove ($_) for @{ $self->{children} };
628
629 $self->SUPER::add ($child); 775 $self->SUPER::add ($child);
630} 776}
631 777
632sub remove { 778sub remove {
633 my ($self, $widget) = @_; 779 my ($self, $widget) = @_;
… …
642 788
643sub size_request { 789sub size_request {
644 $_[0]{children}[0]->size_request 790 $_[0]{children}[0]->size_request
645} 791}
646 792
647sub size_allocate { 793sub invoke_size_allocate {
648 my ($self, $w, $h) = @_; 794 my ($self, $w, $h) = @_;
649 795
650 $self->{children}[0]->configure (0, 0, $w, $h); 796 $self->{children}[0]->configure (0, 0, $w, $h);
797
798 1
651} 799}
652 800
653############################################################################# 801#############################################################################
802
803# back-buffered drawing area
654 804
655package CFClient::UI::Window; 805package CFClient::UI::Window;
656 806
657our @ISA = CFClient::UI::Bin::; 807our @ISA = CFClient::UI::Bin::;
658 808
… …
669 819
670 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 820 $ROOT->on_post_alloc ($self => sub { $self->render_child });
671 $self->SUPER::update; 821 $self->SUPER::update;
672} 822}
673 823
674sub size_allocate { 824sub invoke_size_allocate {
675 my ($self, $w, $h) = @_; 825 my ($self, $w, $h) = @_;
676 826
677 $self->SUPER::size_allocate ($w, $h);
678 $self->update; 827 $self->update;
828
829 $self->SUPER::invoke_size_allocate ($w, $h)
679} 830}
680 831
681sub _render { 832sub _render {
833 my ($self) = @_;
834
682 $_[0]{children}[0]->draw; 835 $self->{children}[0]->draw;
683} 836}
684 837
685sub render_child { 838sub render_child {
686 my ($self) = @_; 839 my ($self) = @_;
687 840
688 $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 {
689 glClearColor 0, 0, 0, 0; 842 glClearColor 0, 0, 0, 0;
690 glClear GL_COLOR_BUFFER_BIT; 843 glClear GL_COLOR_BUFFER_BIT;
691 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
692 $self->_render; 852 $self->_render;
693# glColorMask 1, 1, 1, 0;
694# glEnable GL_BLEND;
695# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
696# glRasterPos 0, 0;
697# glCopyPixels 0, 0, $self->{w}, $self->{h};
698# glDisable GL_BLEND;
699# glColorMask 1, 1, 1, 1;
700 }; 853 };
701} 854}
702 855
703sub _draw { 856sub _draw {
704 my ($self) = @_; 857 my ($self) = @_;
705 858
706 my ($w, $h) = ($self->w, $self->h); 859 my ($w, $h) = @$self{qw(w h)};
707 860
708 my $tex = $self->{texture} 861 my $tex = $self->{texture}
709 or return; 862 or return;
710 863
711 glEnable GL_TEXTURE_2D; 864 glEnable GL_TEXTURE_2D;
… …
721 874
722package CFClient::UI::ViewPort; 875package CFClient::UI::ViewPort;
723 876
724our @ISA = CFClient::UI::Window::; 877our @ISA = CFClient::UI::Window::;
725 878
879sub new {
880 my $class = shift;
881
882 $class->SUPER::new (
883 scroll_x => 0,
884 scroll_y => 1,
885 @_,
886 )
887}
888
726sub size_request { 889sub size_request {
727 my ($self) = @_; 890 my ($self) = @_;
728 891
729 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 892 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
730 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
731 893
732 @$self{qw(child_w child_h)} 894 $w = 10 if $self->{scroll_x};
733} 895 $h = 10 if $self->{scroll_y};
734 896
897 ($w, $h)
898}
899
735sub size_allocate { 900sub invoke_size_allocate {
736 my ($self, $w, $h) = @_; 901 my ($self, $w, $h) = @_;
737 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);
738 $self->update; 909 $self->update;
910
911 1
739} 912}
740 913
741sub set_offset { 914sub set_offset {
742 my ($self, $x, $y) = @_; 915 my ($self, $x, $y) = @_;
743 916
… …
776} 949}
777 950
778sub _render { 951sub _render {
779 my ($self) = @_; 952 my ($self) = @_;
780 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
781 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 957 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
782 958
783 $self->SUPER::_render; 959 $self->SUPER::_render;
784} 960}
785 961
… …
788package CFClient::UI::ScrolledWindow; 964package CFClient::UI::ScrolledWindow;
789 965
790our @ISA = CFClient::UI::HBox::; 966our @ISA = CFClient::UI::HBox::;
791 967
792sub new { 968sub new {
793 my $class = shift; 969 my ($class, %arg) = @_;
970
971 my $child = delete $arg{child};
794 972
795 my $self; 973 my $self;
796 974
797 my $slider = new CFClient::UI::Slider 975 my $slider = new CFClient::UI::Slider
798 vertical => 1, 976 vertical => 1,
799 range => [0, 0, 1, 0.01], # HACK fix 977 range => [0, 0, 1, 0.01], # HACK fix
800 connect_changed => sub { 978 on_changed => sub {
801 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 979 $self->{vp}->set_offset (0, $_[1]);
802 }, 980 },
803 ; 981 ;
804 982
805 $self = $class->SUPER::new ( 983 $self = $class->SUPER::new (
806 vp => (new CFClient::UI::ViewPort), 984 vp => (new CFClient::UI::ViewPort expand => 1),
807 slider => $slider, 985 slider => $slider,
808 @_, 986 %arg,
809 ); 987 );
810 988
811 $self->{vp}->add ($self->{scrolled});
812 $self->add ($self->{vp});
813 $self->add ($self->{slider}); 989 $self->SUPER::add ($self->{vp}, $self->{slider});
990 $self->add ($child) if $child;
814 991
815 $self 992 $self
816} 993}
817 994
818#TODO# update range on size_allocate depending on child 995#TODO# update range on size_allocate depending on child
819# 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}
820 1032
821############################################################################# 1033#############################################################################
822 1034
823package CFClient::UI::Frame; 1035package CFClient::UI::Frame;
824 1036
… …
840 1052
841 if ($self->{bg}) { 1053 if ($self->{bg}) {
842 my ($w, $h) = @$self{qw(w h)}; 1054 my ($w, $h) = @$self{qw(w h)};
843 1055
844 glEnable GL_BLEND; 1056 glEnable GL_BLEND;
845 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1057 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
846 glColor @{ $self->{bg} }; 1058 glColor_premultiply @{ $self->{bg} };
847 1059
848 glBegin GL_QUADS; 1060 glBegin GL_QUADS;
849 glVertex 0 , 0; 1061 glVertex 0 , 0;
850 glVertex 0 , $h; 1062 glVertex 0 , $h;
851 glVertex $w, $h; 1063 glVertex $w, $h;
… …
864 1076
865our @ISA = CFClient::UI::Bin::; 1077our @ISA = CFClient::UI::Bin::;
866 1078
867use CFClient::OpenGL; 1079use CFClient::OpenGL;
868 1080
869my @tex = 1081my $bg =
1082 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1083 mipmap => 1, wrap => 1;
1084
1085my @border =
870 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1086 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
871 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);
872 1088
873sub new { 1089sub new {
874 my $class = shift; 1090 my ($class, %arg) = @_;
875
876 # TODO: user_x, user_y, overwrite moveto?
877 1091
878 my $self = $class->SUPER::new ( 1092 my $self = $class->SUPER::new (
879 bg => [1, 1, 1, 1], 1093 bg => [1, 1, 1, 1],
880 border_bg => [1, 1, 1, 1], 1094 border_bg => [1, 1, 1, 1],
881 border => 0.6, 1095 border => 0.6,
882 toplevel => 1,
883 can_events => 1, 1096 can_events => 1,
884 @_ 1097 min_w => 64,
1098 min_h => 32,
1099 %arg,
885 ); 1100 );
886 1101
887 $self->{title} &&= new CFClient::UI::Label 1102 $self->{title_widget} = new CFClient::UI::Label
888 align => 0, 1103 align => 0,
889 valign => 1, 1104 valign => 1,
890 text => $self->{title}, 1105 text => $self->{title},
891 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 }
892 1117
893 $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};
894} 1127}
895 1128
896sub border { 1129sub border {
897 int $_[0]{border} * $::FONTSIZE 1130 int $_[0]{border} * $::FONTSIZE
898} 1131}
899 1132
900sub size_request { 1133sub size_request {
901 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};
902 1141
903 my ($w, $h) = $self->SUPER::size_request; 1142 my ($w, $h) = $self->SUPER::size_request;
904 1143
905 ( 1144 (
906 $w + $self->border * 2, 1145 $w + $self->border * 2,
907 $h + $self->border * 2, 1146 $h + $self->border * 2,
908 ) 1147 )
909} 1148}
910 1149
911sub size_allocate { 1150sub invoke_size_allocate {
912 my ($self, $w, $h) = @_; 1151 my ($self, $w, $h) = @_;
913 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
914 $h -= List::Util::max 0, $self->border * 2; 1161 $h -= List::Util::max 0, $border * 2;
915 $w -= List::Util::max 0, $self->border * 2; 1162 $w -= List::Util::max 0, $border * 2;
916 1163
917 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
918 if $self->{title};
919
920 $self->child->configure ($self->border, $self->border, $w, $h); 1164 $self->child->configure ($border, $border, $w, $h);
921}
922 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
923sub button_down { 1180sub invoke_button_down {
924 my ($self, $ev, $x, $y) = @_; 1181 my ($self, $ev, $x, $y) = @_;
925 1182
926 my ($w, $h) = @$self{qw(w h)}; 1183 my ($w, $h) = @$self{qw(w h)};
927 my $border = $self->border; 1184 my $border = $self->border;
928 1185
… …
941 my ($ev, $x, $y) = @_; 1198 my ($ev, $x, $y) = @_;
942 1199
943 my $dx = $ev->{x} - $ox; 1200 my $dx = $ev->{x} - $ox;
944 my $dy = $ev->{y} - $oy; 1201 my $dy = $ev->{y} - $oy;
945 1202
946 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1203 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
947 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1204 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1205
948 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1206 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
949 $self->check_size; 1207 $self->realloc;
950 }; 1208 };
951 1209
952 } elsif ($lr ^ $td) { 1210 } elsif ($lr ^ $td) {
953 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1211 my ($ox, $oy) = ($ev->{x}, $ev->{y});
954 my ($bx, $by) = ($self->{x}, $self->{y}); 1212 my ($bx, $by) = ($self->{x}, $self->{y});
… …
956 $self->{motion} = sub { 1214 $self->{motion} = sub {
957 my ($ev, $x, $y) = @_; 1215 my ($ev, $x, $y) = @_;
958 1216
959 ($x, $y) = ($ev->{x}, $ev->{y}); 1217 ($x, $y) = ($ev->{x}, $ev->{y});
960 1218
961 $self->move ($bx + $x - $ox, $by + $y - $oy); 1219 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
962 $self->update; 1220 # HACK: the next line is required to enforce placement
1221 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
963 }; 1222 };
1223 } else {
1224 return 0;
1225 }
1226
964 } 1227 1
965} 1228}
966 1229
967sub button_up { 1230sub invoke_button_up {
968 my ($self, $ev, $x, $y) = @_; 1231 my ($self, $ev, $x, $y) = @_;
969 1232
970 delete $self->{motion}; 1233 ! ! delete $self->{motion}
971} 1234}
972 1235
973sub mouse_motion { 1236sub invoke_mouse_motion {
974 my ($self, $ev, $x, $y) = @_; 1237 my ($self, $ev, $x, $y) = @_;
975 1238
976 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1239 $self->{motion}->($ev, $x, $y) if $self->{motion};
1240
1241 ! ! $self->{motion}
977} 1242}
978 1243
979sub _draw { 1244sub _draw {
980 my ($self) = @_; 1245 my ($self) = @_;
981 1246
1247 my $child = $self->{children}[0];
1248
982 my ($w, $h ) = ($self->{w}, $self->{h}); 1249 my ($w, $h ) = ($self->{w}, $self->{h});
983 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1250 my ($cw, $ch) = ($child->{w}, $child->{h});
984 1251
985 glEnable GL_TEXTURE_2D; 1252 glEnable GL_TEXTURE_2D;
986 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1253 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
987 1254
988 my $border = $self->border; 1255 my $border = $self->border;
989 1256
990 glColor @{ $self->{border_bg} }; 1257 glColor @{ $self->{border_bg} };
991 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1258 $border[0]->draw_quad_alpha (0, 0, $w, $border);
992 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1259 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
993 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1260 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
994 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1261 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
995 1262
996 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1263 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
997 my $bg = $tex[0]; 1264 glColor @{ $self->{bg} };
998 1265
999 # TODO: repeat texture not scale 1266 # TODO: repeat texture not scale
1267 # solve this better(?)
1000 my $rep_x = $cw / $bg->{w}; 1268 $bg->{s} = $cw / $bg->{w};
1001 my $rep_y = $ch / $bg->{h}; 1269 $bg->{t} = $ch / $bg->{h};
1002
1003 glColor @{ $self->{bg} };
1004
1005 $bg->{s} = $rep_x;
1006 $bg->{t} = $rep_y;
1007 $bg->{wrap_mode} = 1;
1008 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1270 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1009 } 1271 }
1010 1272
1011 glDisable GL_TEXTURE_2D; 1273 glDisable GL_TEXTURE_2D;
1012 1274
1013 $self->{title}->draw if $self->{title};
1014
1015 $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};
1016} 1286}
1017 1287
1018############################################################################# 1288#############################################################################
1019 1289
1020package CFClient::UI::Table; 1290package CFClient::UI::Table;
… …
1028sub new { 1298sub new {
1029 my $class = shift; 1299 my $class = shift;
1030 1300
1031 $class->SUPER::new ( 1301 $class->SUPER::new (
1032 col_expand => [], 1302 col_expand => [],
1033 @_ 1303 @_,
1034 ) 1304 )
1305}
1306
1307sub children {
1308 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1035} 1309}
1036 1310
1037sub add { 1311sub add {
1038 my ($self, $x, $y, $child) = @_; 1312 my ($self, $x, $y, $child) = @_;
1039 1313
1040 $child->set_parent ($self); 1314 $child->set_parent ($self);
1041 $self->{children}[$y][$x] = $child; 1315 $self->{children}[$y][$x] = $child;
1042 1316
1043 $child->check_size; 1317 $self->realloc;
1044} 1318}
1045 1319
1046sub children { 1320sub remove {
1047 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1321 my ($self, $child) = @_;
1048}
1049 1322
1323 # TODO: not yet implemented
1324}
1325
1050# 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?
1051sub clear { 1327sub clear {
1052 my ($self) = @_; 1328 my ($self) = @_;
1053 1329
1054 my @children = $self->children; 1330 my @children = $self->children;
1055 delete $self->{children}; 1331 delete $self->{children};
… …
1057 for (@children) { 1333 for (@children) {
1058 delete $_->{parent}; 1334 delete $_->{parent};
1059 $_->hide; 1335 $_->hide;
1060 } 1336 }
1061 1337
1062 $self->update; 1338 $self->realloc;
1063} 1339}
1064 1340
1065sub get_wh { 1341sub get_wh {
1066 my ($self) = @_; 1342 my ($self) = @_;
1067 1343
… …
1093 (sum @$ws), 1369 (sum @$ws),
1094 (sum @$hs), 1370 (sum @$hs),
1095 ) 1371 )
1096} 1372}
1097 1373
1098sub size_allocate { 1374sub invoke_size_allocate {
1099 my ($self, $w, $h) = @_; 1375 my ($self, $w, $h) = @_;
1100 1376
1101 my ($ws, $hs) = $self->get_wh; 1377 my ($ws, $hs) = $self->get_wh;
1102 1378
1103 my $req_w = sum @$ws; 1379 my $req_w = (sum @$ws) || 1;
1104 my $req_h = sum @$hs; 1380 my $req_h = (sum @$hs) || 1;
1105 1381
1106 # TODO: nicer code && do row_expand 1382 # TODO: nicer code && do row_expand
1107 my @col_expand = @{$self->{col_expand}}; 1383 my @col_expand = @{$self->{col_expand}};
1108 @col_expand = (1) x @$ws unless @col_expand; 1384 @col_expand = (1) x @$ws unless @col_expand;
1109 my $col_expand = (sum @col_expand) || 1; 1385 my $col_expand = (sum @col_expand) || 1;
… …
1135 } 1411 }
1136 1412
1137 $y += $row_h; 1413 $y += $row_h;
1138 } 1414 }
1139 1415
1416 1
1140} 1417}
1141 1418
1142sub find_widget { 1419sub find_widget {
1143 my ($self, $x, $y) = @_; 1420 my ($self, $x, $y) = @_;
1144 1421
… …
1163 } 1440 }
1164} 1441}
1165 1442
1166############################################################################# 1443#############################################################################
1167 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
1168package CFClient::UI::HBox; 1505package CFClient::UI::HBox;
1169 1506
1170# TODO: wrap into common Box base class
1171
1172our @ISA = CFClient::UI::Container::; 1507our @ISA = CFClient::UI::Box::;
1173 1508
1174sub size_request { 1509sub new {
1175 my ($self) = @_; 1510 my $class = shift;
1176 1511
1177 my @alloc = map [$_->size_request], @{$self->{children}}; 1512 $class->SUPER::new (
1178 1513 vertical => 0,
1179 ( 1514 @_,
1180 (List::Util::sum map $_->[0], @alloc),
1181 (List::Util::max map $_->[1], @alloc),
1182 ) 1515 )
1183} 1516}
1184 1517
1185sub size_allocate {
1186 my ($self, $w, $h) = @_;
1187
1188 ($h, $w) = ($w, $h);
1189
1190 my $children = $self->{children};
1191
1192 my @h = map $_->{req_w}, @$children;
1193
1194 my $req_h = List::Util::sum @h;
1195
1196 if ($req_h > $h) {
1197 # ah well, not enough space
1198 $_ *= $h / $req_h for @h;
1199 } else {
1200 my $exp = List::Util::sum map $_->{expand}, @$children;
1201 $exp ||= 1;
1202
1203 for (0 .. $#$children) {
1204 my $child = $children->[$_];
1205
1206 my $alloc_h = $h[$_];
1207 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1208 $h[$_] = $alloc_h;
1209 }
1210 }
1211
1212 CFClient::UI::harmonize \@h;
1213
1214 my $y = 0;
1215 for (0 .. $#$children) {
1216 my $child = $children->[$_];
1217 my $h = $h[$_];
1218 $child->configure ($y, 0, $h, $w);
1219
1220 $y += $h;
1221 }
1222
1223 1
1224}
1225
1226############################################################################# 1518#############################################################################
1227 1519
1228package CFClient::UI::VBox; 1520package CFClient::UI::VBox;
1229 1521
1230# TODO: wrap into common Box base class
1231
1232our @ISA = CFClient::UI::Container::; 1522our @ISA = CFClient::UI::Box::;
1233 1523
1234sub size_request { 1524sub new {
1235 my ($self) = @_; 1525 my $class = shift;
1236 1526
1237 my @alloc = map [$_->size_request], @{$self->{children}}; 1527 $class->SUPER::new (
1238 1528 vertical => 1,
1239 ( 1529 @_,
1240 (List::Util::max map $_->[0], @alloc),
1241 (List::Util::sum map $_->[1], @alloc),
1242 ) 1530 )
1243}
1244
1245sub size_allocate {
1246 my ($self, $w, $h) = @_;
1247
1248 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1249
1250 my $children = $self->{children};
1251
1252 my @h = map $_->{req_h}, @$children;
1253
1254 my $req_h = List::Util::sum @h;
1255
1256 if ($req_h > $h) {
1257 # ah well, not enough space
1258 $_ *= $h / $req_h for @h;
1259 } else {
1260 my $exp = List::Util::sum map $_->{expand}, @$children;
1261 $exp ||= 1;
1262
1263 for (0 .. $#$children) {
1264 my $child = $children->[$_];
1265
1266 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1267 }
1268 }
1269
1270 CFClient::UI::harmonize \@h;
1271
1272 my $y = 0;
1273 for (0 .. $#$children) {
1274 my $child = $children->[$_];
1275 my $h = $h[$_];
1276 $child->configure (0, $y, $w, $h);
1277
1278 $y += $h;
1279 }
1280
1281 1
1282} 1531}
1283 1532
1284############################################################################# 1533#############################################################################
1285 1534
1286package CFClient::UI::Label; 1535package CFClient::UI::Label;
… …
1297 #bg => none 1546 #bg => none
1298 #active_bg => none 1547 #active_bg => none
1299 #font => default_font 1548 #font => default_font
1300 #text => initial text 1549 #text => initial text
1301 #markup => initial narkup 1550 #markup => initial narkup
1551 #max_w => maximum pixel width
1552 ellipsise => 3, # end
1302 layout => (new CFClient::Layout), 1553 layout => (new CFClient::Layout),
1303 fontsize => 1, 1554 fontsize => 1,
1304 align => -1, 1555 align => -1,
1305 valign => -1, 1556 valign => -1,
1306 padding => 2, 1557 padding_x => 2,
1558 padding_y => 2,
1307 can_events => 0, 1559 can_events => 0,
1308 %arg 1560 %arg
1309 ); 1561 );
1310 1562
1311 if (exists $self->{template}) { 1563 if (exists $self->{template}) {
… …
1338 1590
1339 delete $self->{texture}; 1591 delete $self->{texture};
1340 $self->SUPER::update; 1592 $self->SUPER::update;
1341} 1593}
1342 1594
1595sub realloc {
1596 my ($self) = @_;
1597
1598 delete $self->{ox};
1599 $self->SUPER::realloc;
1600}
1601
1343sub set_text { 1602sub set_text {
1344 my ($self, $text) = @_; 1603 my ($self, $text) = @_;
1345 1604
1346 return if $self->{text} eq "T$text"; 1605 return if $self->{text} eq "T$text";
1347 $self->{text} = "T$text"; 1606 $self->{text} = "T$text";
1348 1607
1349 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1350 $self->{layout}->set_text ($text); 1608 $self->{layout}->set_text ($text);
1351 1609
1610 delete $self->{size_req};
1611 $self->realloc;
1352 $self->update; 1612 $self->update;
1353 $self->check_size;
1354} 1613}
1355 1614
1356sub set_markup { 1615sub set_markup {
1357 my ($self, $markup) = @_; 1616 my ($self, $markup) = @_;
1358 1617
1359 return if $self->{text} eq "M$markup"; 1618 return if $self->{text} eq "M$markup";
1360 $self->{text} = "M$markup"; 1619 $self->{text} = "M$markup";
1361 1620
1362 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1621 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1363 1622
1364 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1365 $self->{layout}->set_markup ($markup); 1623 $self->{layout}->set_markup ($markup);
1366 1624
1625 delete $self->{size_req};
1626 $self->realloc;
1367 $self->update; 1627 $self->update;
1368 $self->check_size;
1369} 1628}
1370 1629
1371sub size_request { 1630sub size_request {
1372 my ($self) = @_; 1631 my ($self) = @_;
1373 1632
1633 $self->{size_req} ||= do {
1374 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1634 $self->{layout}->set_font ($self->{font}) if $self->{font};
1375 $self->{layout}->set_width ($self->{max_w} || -1); 1635 $self->{layout}->set_width ($self->{max_w} || -1);
1636 $self->{layout}->set_ellipsise ($self->{ellipsise});
1637 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1376 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1638 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1377 1639
1378 my ($w, $h) = $self->{layout}->size; 1640 my ($w, $h) = $self->{layout}->size;
1379 1641
1380 if (exists $self->{template}) { 1642 if (exists $self->{template}) {
1381 $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);
1382 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1645 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1383 1646
1384 my ($w2, $h2) = $self->{template}->size; 1647 my ($w2, $h2) = $self->{template}->size;
1385 1648
1386 $w = List::Util::max $w, $w2; 1649 $w = List::Util::max $w, $w2;
1387 $h = List::Util::max $h, $h2; 1650 $h = List::Util::max $h, $h2;
1651 }
1652
1653 [$w, $h]
1388 } 1654 };
1389 1655
1390 ( 1656 @{ $self->{size_req} }
1391 $w + $self->{padding} * 2,
1392 $h + $self->{padding} * 2,
1393 )
1394} 1657}
1395 1658
1659sub baseline_shift {
1660 $_[0]{layout}->descent
1661}
1662
1396sub size_allocate { 1663sub invoke_size_allocate {
1397 my ($self, $w, $h) = @_; 1664 my ($self, $w, $h) = @_;
1398 1665
1666 delete $self->{ox};
1667
1399 delete $self->{texture}; 1668 delete $self->{texture}
1669 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1670
1671 1
1400} 1672}
1401 1673
1402sub set_fontsize { 1674sub set_fontsize {
1403 my ($self, $fontsize) = @_; 1675 my ($self, $fontsize) = @_;
1404 1676
1405 $self->{fontsize} = $fontsize; 1677 $self->{fontsize} = $fontsize;
1678 delete $self->{size_req};
1406 delete $self->{texture}; 1679 delete $self->{texture};
1407 1680
1408 $self->update; 1681 $self->realloc;
1409 $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;
1410} 1691}
1411 1692
1412sub _draw { 1693sub _draw {
1413 my ($self) = @_; 1694 my ($self) = @_;
1414 1695
1415 $self->SUPER::_draw; # draw background, if applicable 1696 $self->SUPER::_draw; # draw background, if applicable
1416 1697
1417 my $tex = $self->{texture} ||= do { 1698 my $size = $self->{texture} ||= do {
1418 $self->{layout}->set_foreground (@{$self->{fg}}); 1699 $self->{layout}->set_foreground (@{$self->{fg}});
1419 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1700 $self->{layout}->set_font ($self->{font}) if $self->{font};
1420 $self->{layout}->set_width ($self->{w}); 1701 $self->{layout}->set_width ($self->{w});
1702 $self->{layout}->set_ellipsise ($self->{ellipsise});
1703 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1421 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1704 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1422 1705
1423 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1706 [$self->{layout}->size]
1424
1425 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1426 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1427 : ($self->{w} - $tex->{w}) * 0.5);
1428
1429 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1430 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1431 : ($self->{h} - $tex->{h}) * 0.5);
1432
1433 $tex
1434 }; 1707 };
1435 1708
1436 glEnable GL_TEXTURE_2D; 1709 unless (exists $self->{ox}) {
1437 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);
1438 1713
1439 if ($tex->{format} == GL_ALPHA) { 1714 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1440 glColor @{$self->{fg}}; 1715 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1441 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1716 : ($self->{h} - $size->[1]) * 0.5);
1442 } else {
1443 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1444 } 1717 };
1445 1718
1446 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});
1447} 1723}
1448 1724
1449############################################################################# 1725#############################################################################
1450 1726
1451package CFClient::UI::EntryBase; 1727package CFClient::UI::EntryBase;
… …
1464 active_fg => [0, 0, 0], 1740 active_fg => [0, 0, 0],
1465 can_hover => 1, 1741 can_hover => 1,
1466 can_focus => 1, 1742 can_focus => 1,
1467 valign => 0, 1743 valign => 0,
1468 can_events => 1, 1744 can_events => 1,
1745 #text => ...
1746 #hidden => "*",
1469 @_ 1747 @_
1470 ) 1748 )
1471} 1749}
1472 1750
1473sub _set_text { 1751sub _set_text {
… …
1475 1753
1476 delete $self->{cur_h}; 1754 delete $self->{cur_h};
1477 1755
1478 return if $self->{text} eq $text; 1756 return if $self->{text} eq $text;
1479 1757
1480 delete $self->{texture};
1481
1482 $self->{last_activity} = $::NOW; 1758 $self->{last_activity} = $::NOW;
1483 $self->{text} = $text; 1759 $self->{text} = $text;
1484 1760
1485 $text =~ s/./*/g if $self->{hidden}; 1761 $text =~ s/./*/g if $self->{hidden};
1486 $self->{layout}->set_text ("$text "); 1762 $self->{layout}->set_text ("$text ");
1763 delete $self->{size_req};
1487 1764
1488 $self->emit (changed => $self->{text}); 1765 $self->emit (changed => $self->{text});
1766
1767 $self->realloc;
1768 $self->update;
1489} 1769}
1490 1770
1491sub set_text { 1771sub set_text {
1492 my ($self, $text) = @_; 1772 my ($self, $text) = @_;
1493 1773
1494 $self->{cursor} = length $text; 1774 $self->{cursor} = length $text;
1495 $self->_set_text ($text); 1775 $self->_set_text ($text);
1496 $self->update;
1497 $self->check_size;
1498} 1776}
1499 1777
1500sub get_text { 1778sub get_text {
1501 $_[0]{text} 1779 $_[0]{text}
1502} 1780}
… …
1507 my ($w, $h) = $self->SUPER::size_request; 1785 my ($w, $h) = $self->SUPER::size_request;
1508 1786
1509 ($w + 1, $h) # add 1 for cursor 1787 ($w + 1, $h) # add 1 for cursor
1510} 1788}
1511 1789
1512sub size_allocate {
1513 my ($self, $w, $h) = @_;
1514
1515 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1516}
1517
1518sub key_down { 1790sub invoke_key_down {
1519 my ($self, $ev) = @_; 1791 my ($self, $ev) = @_;
1520 1792
1521 my $mod = $ev->{mod}; 1793 my $mod = $ev->{mod};
1522 my $sym = $ev->{sym}; 1794 my $sym = $ev->{sym};
1523 my $uni = $ev->{unicode}; 1795 my $uni = $ev->{unicode};
… …
1538 $self->{cursor} = length $text; 1810 $self->{cursor} = length $text;
1539 } elsif ($uni == 27) { 1811 } elsif ($uni == 27) {
1540 $self->emit ('escape'); 1812 $self->emit ('escape');
1541 } elsif ($uni) { 1813 } elsif ($uni) {
1542 substr $text, $self->{cursor}++, 0, chr $uni; 1814 substr $text, $self->{cursor}++, 0, chr $uni;
1815 } else {
1816 return 0;
1543 } 1817 }
1544 1818
1545 $self->_set_text ($text); 1819 $self->_set_text ($text);
1546 $self->update;
1547 $self->check_size;
1548}
1549 1820
1821 $self->realloc;
1822
1823 1
1824}
1825
1550sub focus_in { 1826sub invoke_focus_in {
1551 my ($self) = @_; 1827 my ($self) = @_;
1552 1828
1553 $self->{last_activity} = $::NOW; 1829 $self->{last_activity} = $::NOW;
1554 1830
1555 $self->SUPER::focus_in; 1831 $self->SUPER::invoke_focus_in
1556} 1832}
1557 1833
1558sub button_down { 1834sub invoke_button_down {
1559 my ($self, $ev, $x, $y) = @_; 1835 my ($self, $ev, $x, $y) = @_;
1560 1836
1561 $self->SUPER::button_down ($ev, $x, $y); 1837 $self->SUPER::invoke_button_down ($ev, $x, $y);
1562 1838
1563 my $idx = $self->{layout}->xy_to_index ($x, $y); 1839 my $idx = $self->{layout}->xy_to_index ($x, $y);
1564 1840
1565 # byte-index to char-index 1841 # byte-index to char-index
1566 my $text = $self->{text}; 1842 my $text = $self->{text};
1567 utf8::encode $text; 1843 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1568 $self->{cursor} = length substr $text, 0, $idx; 1844 $self->{cursor} = length $text;
1569 1845
1570 $self->_set_text ($self->{text}); 1846 $self->_set_text ($self->{text});
1571 $self->update; 1847 $self->update;
1848
1849 1
1572} 1850}
1573 1851
1574sub mouse_motion { 1852sub invoke_mouse_motion {
1575 my ($self, $ev, $x, $y) = @_; 1853 my ($self, $ev, $x, $y) = @_;
1576# 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
1577} 1857}
1578 1858
1579sub _draw { 1859sub _draw {
1580 my ($self) = @_; 1860 my ($self) = @_;
1581 1861
1582 local $self->{fg} = $self->{fg}; 1862 local $self->{fg} = $self->{fg};
1583 1863
1584 if ($FOCUS == $self) { 1864 if ($FOCUS == $self) {
1585 glColor @{$self->{active_bg}}; 1865 glColor_premultiply @{$self->{active_bg}};
1586 $self->{fg} = $self->{active_fg}; 1866 $self->{fg} = $self->{active_fg};
1587 } else { 1867 } else {
1588 glColor @{$self->{bg}}; 1868 glColor_premultiply @{$self->{bg}};
1589 } 1869 }
1590 1870
1591 glEnable GL_BLEND; 1871 glEnable GL_BLEND;
1592 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1872 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1593 glBegin GL_QUADS; 1873 glBegin GL_QUADS;
1594 glVertex 0 , 0; 1874 glVertex 0 , 0;
1595 glVertex 0 , $self->{h}; 1875 glVertex 0 , $self->{h};
1596 glVertex $self->{w}, $self->{h}; 1876 glVertex $self->{w}, $self->{h};
1597 glVertex $self->{w}, 0; 1877 glVertex $self->{w}, 0;
… …
1622 1902
1623our @ISA = CFClient::UI::EntryBase::; 1903our @ISA = CFClient::UI::EntryBase::;
1624 1904
1625use CFClient::OpenGL; 1905use CFClient::OpenGL;
1626 1906
1627sub key_down { 1907sub invoke_key_down {
1628 my ($self, $ev) = @_; 1908 my ($self, $ev) = @_;
1629 1909
1630 my $sym = $ev->{sym}; 1910 my $sym = $ev->{sym};
1631 1911
1632 if ($sym == 13) { 1912 if ($sym == 13) {
1633 unshift @{$self->{history}}, 1913 unshift @{$self->{history}},
1634 my $txt = $self->get_text; 1914 my $txt = $self->get_text;
1915
1635 $self->{history_pointer} = -1; 1916 $self->{history_pointer} = -1;
1636 $self->{history_saveback} = ''; 1917 $self->{history_saveback} = '';
1637 $self->emit (activate => $txt); 1918 $self->emit (activate => $txt);
1638 $self->update; 1919 $self->update;
1639 1920
… …
1658 } else { 1939 } else {
1659 $self->set_text ($self->{history_saveback}); 1940 $self->set_text ($self->{history_saveback});
1660 } 1941 }
1661 1942
1662 } else { 1943 } else {
1663 $self->SUPER::key_down ($ev); 1944 return $self->SUPER::invoke_key_down ($ev)
1945 }
1946
1664 } 1947 1
1665
1666} 1948}
1667 1949
1668############################################################################# 1950#############################################################################
1669 1951
1670package CFClient::UI::Button; 1952package CFClient::UI::Button;
… …
1679 1961
1680sub new { 1962sub new {
1681 my $class = shift; 1963 my $class = shift;
1682 1964
1683 $class->SUPER::new ( 1965 $class->SUPER::new (
1684 padding => 4, 1966 padding_x => 4,
1967 padding_y => 4,
1685 fg => [1, 1, 1], 1968 fg => [1, 1, 1],
1686 active_fg => [0, 0, 1], 1969 active_fg => [0, 0, 1],
1687 can_hover => 1, 1970 can_hover => 1,
1688 align => 0, 1971 align => 0,
1689 valign => 0, 1972 valign => 0,
1690 can_events => 1, 1973 can_events => 1,
1691 @_ 1974 @_
1692 ) 1975 )
1693} 1976}
1694 1977
1695sub button_up { 1978sub invoke_button_up {
1696 my ($self, $ev, $x, $y) = @_; 1979 my ($self, $ev, $x, $y) = @_;
1697 1980
1981 $self->emit ("activate")
1698 if ($x >= 0 && $x < $self->{w} 1982 if $x >= 0 && $x < $self->{w}
1699 && $y >= 0 && $y < $self->{h}) { 1983 && $y >= 0 && $y < $self->{h};
1700 $self->emit ("activate"); 1984
1701 } 1985 1
1702} 1986}
1703 1987
1704sub _draw { 1988sub _draw {
1705 my ($self) = @_; 1989 my ($self) = @_;
1706 1990
1707 local $self->{fg} = $self->{fg}; 1991 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1708
1709 if ($GRAB == $self) {
1710 $self->{fg} = $self->{active_fg};
1711 }
1712 1992
1713 glEnable GL_TEXTURE_2D; 1993 glEnable GL_TEXTURE_2D;
1714 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1994 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1715 glColor 0, 0, 0, 1; 1995 glColor 0, 0, 0, 1;
1716 1996
… …
1721 $self->SUPER::_draw; 2001 $self->SUPER::_draw;
1722} 2002}
1723 2003
1724############################################################################# 2004#############################################################################
1725 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
1726package CFClient::UI::CheckBox; 2042package CFClient::UI::CheckBox;
1727 2043
1728our @ISA = CFClient::UI::DrawBG::; 2044our @ISA = CFClient::UI::DrawBG::;
1729 2045
1730my @tex = 2046my @tex =
… …
1735 2051
1736sub new { 2052sub new {
1737 my $class = shift; 2053 my $class = shift;
1738 2054
1739 $class->SUPER::new ( 2055 $class->SUPER::new (
1740 padding => 2, 2056 padding_x => 2,
2057 padding_y => 2,
1741 fg => [1, 1, 1], 2058 fg => [1, 1, 1],
1742 active_fg => [1, 1, 0], 2059 active_fg => [1, 1, 0],
1743 bg => [0, 0, 0, 0.2], 2060 bg => [0, 0, 0, 0.2],
1744 active_bg => [1, 1, 1, 0.5], 2061 active_bg => [1, 1, 1, 0.5],
1745 state => 0, 2062 state => 0,
… …
1749} 2066}
1750 2067
1751sub size_request { 2068sub size_request {
1752 my ($self) = @_; 2069 my ($self) = @_;
1753 2070
1754 ($self->{padding} * 2 + 6) x 2 2071 (6) x 2
1755} 2072}
1756 2073
2074sub toggle {
2075 my ($self) = @_;
2076
2077 $self->{state} = !$self->{state};
2078 $self->emit (changed => $self->{state});
2079 $self->update;
2080}
2081
1757sub button_down { 2082sub invoke_button_down {
1758 my ($self, $ev, $x, $y) = @_; 2083 my ($self, $ev, $x, $y) = @_;
1759 2084
1760 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2085 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1761 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2086 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1762 $self->{state} = !$self->{state}; 2087 $self->toggle;
1763 $self->emit (changed => $self->{state}); 2088 } else {
2089 return 0
2090 }
2091
1764 } 2092 1
1765} 2093}
1766 2094
1767sub _draw { 2095sub _draw {
1768 my ($self) = @_; 2096 my ($self) = @_;
1769 2097
1770 $self->SUPER::_draw; 2098 $self->SUPER::_draw;
1771 2099
1772 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2100 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1773 2101
1774 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;
1775 2105
1776 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2106 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1777 2107
1778 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2108 my $tex = $self->{state} ? $tex[1] : $tex[0];
1779 2109
… …
1787package CFClient::UI::Image; 2117package CFClient::UI::Image;
1788 2118
1789our @ISA = CFClient::UI::Base::; 2119our @ISA = CFClient::UI::Base::;
1790 2120
1791use CFClient::OpenGL; 2121use CFClient::OpenGL;
1792use Carp qw/confess/;
1793 2122
1794our %loaded_images; 2123our %texture_cache;
1795 2124
1796sub new { 2125sub new {
1797 my $class = shift; 2126 my $class = shift;
1798 2127
1799 my $self = $class->SUPER::new (can_events => 0, @_); 2128 my $self = $class->SUPER::new (
2129 can_events => 0,
2130 @_,
2131 );
1800 2132
1801 $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";
1802 2135
1803 $loaded_images{$self->{image}} ||= 2136 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1804 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;
1805 2138
1806 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2139 Scalar::Util::weaken $texture_cache{$self->{path}};
1807 2140
1808 Scalar::Util::weaken $loaded_images{$self->{image}}; 2141 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1809
1810 $self->{aspect} = $tex->{w} / $tex->{h};
1811 2142
1812 $self 2143 $self
1813} 2144}
1814 2145
1815sub size_request { 2146sub size_request {
1816 my ($self) = @_; 2147 my ($self) = @_;
1817 2148
1818 ($self->{tex}->{w}, $self->{tex}->{h}) 2149 ($self->{tex}{w}, $self->{tex}{h})
1819} 2150}
1820 2151
1821sub _draw { 2152sub _draw {
1822 my ($self) = @_; 2153 my ($self) = @_;
1823 2154
… …
1932 my $ycut1 = max 0, min 1, $ycut; 2263 my $ycut1 = max 0, min 1, $ycut;
1933 my $ycut2 = max 0, min 1, $ycut - 1; 2264 my $ycut2 = max 0, min 1, $ycut - 1;
1934 2265
1935 my $h1 = $self->{h} * (1 - $ycut1); 2266 my $h1 = $self->{h} * (1 - $ycut1);
1936 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);
1937 2271
1938 glEnable GL_BLEND; 2272 glEnable GL_BLEND;
1939 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;
1940 glEnable GL_TEXTURE_2D; 2275 glEnable GL_TEXTURE_2D;
1941 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2276 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1942 2277
1943 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2278 glBindTexture GL_TEXTURE_2D, $t1->{name};
1944 glBegin GL_QUADS; 2279 glBegin GL_QUADS;
… …
1959 2294
1960 if ($t3) { 2295 if ($t3) {
1961 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2296 glBindTexture GL_TEXTURE_2D, $t3->{name};
1962 glBegin GL_QUADS; 2297 glBegin GL_QUADS;
1963 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2298 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1964 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2299 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
1965 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2300 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
1966 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2301 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1967 glEnd; 2302 glEnd;
1968 } 2303 }
1969 2304
1970 glDisable GL_BLEND; 2305 glDisable GL_BLEND;
… …
2043 my $self = $class->SUPER::new ( 2378 my $self = $class->SUPER::new (
2044 fg => [1, 1, 1], 2379 fg => [1, 1, 1],
2045 active_fg => [0, 0, 0], 2380 active_fg => [0, 0, 0],
2046 bg => [0, 0, 0, 0.2], 2381 bg => [0, 0, 0, 0.2],
2047 active_bg => [1, 1, 1, 0.5], 2382 active_bg => [1, 1, 1, 0.5],
2048 range => [0, 0, 100, 10], 2383 range => [0, 0, 100, 10, 0],
2049 req_w => $::WIDTH / 80, 2384 min_w => $::WIDTH / 80,
2050 req_h => $::WIDTH / 80, 2385 min_h => $::WIDTH / 80,
2051 vertical => 0, 2386 vertical => 0,
2052 can_hover => 1, 2387 can_hover => 1,
2053 inner_pad => .05, 2388 inner_pad => 0.02,
2054 @_ 2389 @_
2055 ); 2390 );
2056 2391
2057 $self->set_value ($self->{range}[0]); 2392 $self->set_value ($self->{range}[0]);
2058 $self->update; 2393 $self->update;
2059 2394
2060 $self 2395 $self
2061} 2396}
2062 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
2063sub set_value { 2409sub set_value {
2064 my ($self, $value) = @_; 2410 my ($self, $value) = @_;
2065 2411
2066 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2412 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2067 2413
2068 $hi = $lo + 1 if $hi <= $lo; 2414 $hi = $lo + 1 if $hi <= $lo;
2069 2415
2416 $page = $hi - $lo if $page > $hi - $lo;
2417
2070 $value = $lo if $value < $lo; 2418 $value = $lo if $value < $lo;
2071 $value = $hi if $value > $hi; 2419 $value = $hi - $page if $value > $hi - $page;
2072 2420
2073 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2421 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2074 if $unit; 2422 if $unit;
2075
2076 $page = $hi - $lo if $page > $hi - $lo;
2077 2423
2078 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2424 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2079 2425
2080 if ($value != $old_value) { 2426 if ($value != $old_value) {
2081 $self->emit (changed => $value); 2427 $self->emit (changed => $value);
… …
2084} 2430}
2085 2431
2086sub size_request { 2432sub size_request {
2087 my ($self) = @_; 2433 my ($self) = @_;
2088 2434
2089 my $w = $self->{req_w}; 2435 ($self->{req_w}, $self->{req_h})
2090 my $h = $self->{req_h};
2091
2092 $self->{vertical} ? ($h, $w) : ($w, $h)
2093} 2436}
2094 2437
2095sub button_down { 2438sub invoke_button_down {
2096 my ($self, $ev, $x, $y) = @_; 2439 my ($self, $ev, $x, $y) = @_;
2097 2440
2098 $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
2099 $self->mouse_motion ($ev, $x, $y); 2445 $self->invoke_mouse_motion ($ev, $x, $y)
2100} 2446}
2101 2447
2102sub mouse_motion { 2448sub invoke_mouse_motion {
2103 my ($self, $ev, $x, $y) = @_; 2449 my ($self, $ev, $x, $y) = @_;
2104 2450
2105 if ($GRAB == $self) { 2451 if ($GRAB == $self) {
2106 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2452 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2107 2453
2108 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2454 my (undef, $lo, $hi, $page) = @{$self->{range}};
2109 2455
2110 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2456 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2111 2457
2112 $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
2113 } 2463 1
2114} 2464}
2115 2465
2116sub update { 2466sub update {
2117 my ($self) = @_; 2467 my ($self) = @_;
2118 2468
2119 $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}) {
2120 $self->set_value ($self->{range}[0]); 2477 $self->set_value ($self->{range}[0]);
2121 2478
2122 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2479 my ($value, $lo, $hi, $page) = @{$self->{range}};
2480 my $range = ($hi - $page - $lo) || 1e-100;
2123 2481
2124 my $inner_w = 1 - 2 * $self->{inner_pad}; 2482 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2125 2483
2126 $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;
2127 2486
2128 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2487 $value = ($value - $lo) / $range;
2129 $value = $self->{scale} * ($value - $lo); 2488 $value = $value * $self->{scale} + $self->{offset};
2130 2489
2131 $value = $self->{inner_pad} + ($value - $page * 0.5);
2132
2133 $value = 0 if $value < 0;
2134 $page = 1 - $value if $value + $page > 1;
2135
2136 $self->{knob_x} = $value; 2490 $self->{knob_x} = $value - $knob_w * 0.5;
2137 $self->{knob_w} = $page; 2491 $self->{knob_w} = $knob_w;
2138 }); 2492 }
2139
2140 $self->SUPER::update;
2141}
2142
2143sub _draw {
2144 my ($self) = @_;
2145 2493
2146 $self->SUPER::_draw (); 2494 $self->SUPER::_draw ();
2147 2495
2148 glScale $self->{w}, $self->{h}; 2496 glScale $self->{w}, $self->{h};
2149 2497
2150 if ($self->{vertical}) { 2498 if ($self->{vertical}) {
2151 # draw a vertical slider like a rotated horizontal slider 2499 # draw a vertical slider like a rotated horizontal slider
2152 2500
2501 glTranslate 1, 0, 0;
2153 glRotate 90, 0, 0, 1; 2502 glRotate 90, 0, 0, 1;
2154 glTranslate 0, 1, 0;
2155 } 2503 }
2156 2504
2157 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2505 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2158 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2506 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2159 2507
… …
2169 glDisable GL_TEXTURE_2D; 2517 glDisable GL_TEXTURE_2D;
2170} 2518}
2171 2519
2172############################################################################# 2520#############################################################################
2173 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
2174package CFClient::UI::TextView; 2563package CFClient::UI::TextScroller;
2175 2564
2176our @ISA = CFClient::UI::HBox::; 2565our @ISA = CFClient::UI::HBox::;
2177 2566
2178use CFClient::OpenGL; 2567use CFClient::OpenGL;
2179 2568
… …
2181 my $class = shift; 2570 my $class = shift;
2182 2571
2183 my $self = $class->SUPER::new ( 2572 my $self = $class->SUPER::new (
2184 fontsize => 1, 2573 fontsize => 1,
2185 can_events => 0, 2574 can_events => 0,
2575 indent => 0,
2186 #font => default_font 2576 #font => default_font
2187 @_, 2577 @_,
2188 2578
2189 layout => (new CFClient::Layout 1), 2579 layout => (new CFClient::Layout),
2190 par => [], 2580 par => [],
2191 height => 0, 2581 height => 0,
2192 children => [ 2582 children => [
2193 (new CFClient::UI::Empty expand => 1), 2583 (new CFClient::UI::Empty expand => 1),
2194 (new CFClient::UI::Slider vertical => 1), 2584 (new CFClient::UI::Slider vertical => 1),
… …
2205 2595
2206 $self->{fontsize} = $fontsize; 2596 $self->{fontsize} = $fontsize;
2207 $self->reflow; 2597 $self->reflow;
2208} 2598}
2209 2599
2210sub 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 {
2211 my ($self, $text) = @_; 2627 my ($self, $para) = @_;
2212 2628
2213 my $layout = $self->{layout}; 2629 my $layout = $self->{layout};
2214 2630
2631 $layout->set_font ($self->{font}) if $self->{font};
2632 $layout->set_foreground (@{$para->{fg}});
2215 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2633 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2216 $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});
2217 $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}}
2218 2642 );
2219 ($layout->size)[1] 2643
2644 $layout
2220} 2645}
2221 2646
2222sub reflow { 2647sub reflow {
2223 my ($self) = @_; 2648 my ($self) = @_;
2224 2649
2225 $self->{need_reflow}++; 2650 $self->{need_reflow}++;
2226 $self->update; 2651 $self->update;
2227} 2652}
2228 2653
2229sub 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 {
2230 my ($self, $w, $h) = @_; 2662 my ($self) = @_;
2231 2663
2232 $self->SUPER::size_allocate ($w, $h); 2664 my (undef, undef, @other) = @{ $self->{children} };
2665 $self->remove ($_) for @other;
2233 2666
2234 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2667 $self->{par} = [];
2235 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2668 $self->{height} = 0;
2236 $self->{layout}->set_width ($self->{children}[0]{w}); 2669 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2237
2238 $self->reflow;
2239} 2670}
2240 2671
2241sub add_paragraph { 2672sub add_paragraph {
2242 my ($self, $color, $text) = @_; 2673 my ($self, $color, $para, $indent) = @_;
2243 2674
2244 #TODO: intelligently "reformat" paragraph 2675 my ($text, @w) = ref $para ? @$para : $para;
2245 2676
2246 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 };
2247 2685
2248 $self->{height} += $height; 2686 $self->add (@w) if @w;
2687 push @{$self->{par}}, $para;
2249 2688
2250 push @{$self->{par}}, [$height, $color, $text]; 2689 $self->{need_reflow}++;
2690 $self->update;
2691}
2251 2692
2252 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2693sub scroll_to_bottom {
2253 $self->{children}[1]->update; 2694 my ($self) = @_;
2695
2696 $self->{scroll_to_bottom} = 1;
2697 $self->update;
2254} 2698}
2255 2699
2256sub update { 2700sub update {
2257 my ($self) = @_; 2701 my ($self) = @_;
2258 2702
… …
2260 2704
2261 return unless $self->{h} > 0; 2705 return unless $self->{h} > 0;
2262 2706
2263 delete $self->{texture}; 2707 delete $self->{texture};
2264 2708
2265 $ROOT->on_post_alloc ($self, sub { 2709 $ROOT->on_post_alloc ($self => sub {
2710 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2711
2266 if (delete $self->{need_reflow}) { 2712 if (delete $self->{need_reflow}) {
2267 my $height = 0; 2713 my $height = 0;
2268 2714
2269 $height += $_->[0] = $self->text_height ($_->[2])
2270 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 }
2271 2727
2272 $self->{height} = $height; 2728 $self->{height} = $height;
2273 2729
2274 $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]);
2275 2731
2276 delete $self->{texture}; 2732 delete $self->{texture};
2277 } 2733 }
2278 2734
2735 if (delete $self->{scroll_to_bottom}) {
2736 $self->{children}[1]->set_value (1e10);
2737 }
2738
2279 $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 {
2280 glClearColor 0, 0, 0, 0; 2740 glClearColor 0, 0, 0, 0;
2281 glClear GL_COLOR_BUFFER_BIT; 2741 glClear GL_COLOR_BUFFER_BIT;
2282 2742
2283 glEnable GL_TEXTURE_2D;
2284 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2285
2286 my $top = int $self->{children}[1]{range}[0]; 2743 my $top = int $self->{children}[1]{range}[0];
2287 2744
2288 my $y0 = $top; 2745 my $y0 = $top;
2289 my $y1 = $top + $self->{h}; 2746 my $y1 = $top + $H;
2290 2747
2291 my $y = 0; 2748 my $y = 0;
2292 2749
2293 my $layout = $self->{layout};
2294
2295 $layout->set_font ($self->{font}) if $self->{font};
2296
2297 for my $par (@{$self->{par}}) { 2750 for my $para (@{$self->{par}}) {
2298 my $h = $par->[0]; 2751 my $h = $para->{h};
2299 2752
2300 if ($y0 < $y + $h && $y < $y1) { 2753 if ($y0 < $y + $h && $y < $y1) {
2301 $layout->set_foreground (@{ $par->[1] });
2302 $layout->set_markup ($par->[2]);
2303 2754
2304 my ($W, $H) = $layout->size; 2755 my $layout = $self->get_layout ($para);
2305 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 }
2306 } 2771 }
2307 2772
2308 $y += $h; 2773 $y += $h;
2309 } 2774 }
2310
2311 glDisable GL_TEXTURE_2D;
2312 }; 2775 };
2313 }); 2776 });
2314} 2777}
2315 2778
2779sub reconfigure {
2780 my ($self) = @_;
2781
2782 $self->SUPER::reconfigure;
2783
2784 $_->{w} = 1e10 for @{ $self->{par} };
2785 $self->reflow;
2786}
2787
2316sub _draw { 2788sub _draw {
2317 my ($self) = @_; 2789 my ($self) = @_;
2318 2790
2319 glEnable GL_TEXTURE_2D; 2791 glEnable GL_TEXTURE_2D;
2320 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2792 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2321 glColor 1, 1, 1, 1; 2793 glColor 0, 0, 0, 1;
2322 $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});
2323 glDisable GL_TEXTURE_2D; 2795 glDisable GL_TEXTURE_2D;
2324 2796
2325 $self->{children}[1]->draw; 2797 $self->{children}[1]->draw;
2326
2327} 2798}
2328 2799
2329############################################################################# 2800#############################################################################
2330 2801
2331package CFClient::UI::Animator; 2802package CFClient::UI::Animator;
… …
2376 2847
2377sub new { 2848sub new {
2378 my $class = shift; 2849 my $class = shift;
2379 2850
2380 my $self = $class->SUPER::new ( 2851 my $self = $class->SUPER::new (
2381 state => 0, 2852 state => 0,
2382 connect_activate => \&toggle_flopper, 2853 on_activate => \&toggle_flopper,
2383 @_ 2854 @_
2384 ); 2855 );
2385 2856
2386 if ($self->{state}) {
2387 $self->{state} = 0;
2388 $self->toggle_flopper;
2389 }
2390
2391 $self 2857 $self
2392} 2858}
2393 2859
2394sub toggle_flopper { 2860sub toggle_flopper {
2395 my ($self) = @_; 2861 my ($self) = @_;
2396 2862
2397 # TODO: use animation 2863 $self->{other}->toggle_visibility;
2398 if ($self->{state} = !$self->{state}) {
2399 $CFClient::UI::ROOT->add ($self->{other});
2400 $self->{other}->move ($self->coord2global (0, $self->{h}));
2401 $self->emit ("open");
2402 } else {
2403 $CFClient::UI::ROOT->remove ($self->{other});
2404 $self->emit ("close");
2405 }
2406
2407 $self->emit (changed => $self->{state});
2408} 2864}
2409 2865
2410############################################################################# 2866#############################################################################
2411 2867
2412package CFClient::UI::Tooltip; 2868package CFClient::UI::Tooltip;
… …
2425} 2881}
2426 2882
2427sub set_tooltip_from { 2883sub set_tooltip_from {
2428 my ($self, $widget) = @_; 2884 my ($self, $widget) = @_;
2429 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
2430 $self->add (new CFClient::UI::Label 2898 $self->add (new CFClient::UI::Label
2431 markup => $widget->{tooltip}, 2899 markup => $tooltip,
2432 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2900 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2433 fontsize => 0.8, 2901 fontsize => 0.8,
2434 fg => [0, 0, 0, 1], 2902 fg => [0, 0, 0, 1],
2903 ellipsise => 0,
2435 font => ($widget->{tooltip_font} || $::FONT_PROP), 2904 font => ($widget->{tooltip_font} || $::FONT_PROP),
2436 ); 2905 );
2437} 2906}
2438 2907
2439sub size_request { 2908sub size_request {
2440 my ($self) = @_; 2909 my ($self) = @_;
… …
2442 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2911 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2443 2912
2444 ($w + 4, $h + 4) 2913 ($w + 4, $h + 4)
2445} 2914}
2446 2915
2447sub size_allocate { 2916sub invoke_size_allocate {
2448 my ($self, $w, $h) = @_; 2917 my ($self, $w, $h) = @_;
2449 2918
2450 $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 });
2451} 2938}
2452 2939
2453sub _draw { 2940sub _draw {
2454 my ($self) = @_; 2941 my ($self) = @_;
2455 2942
… …
2472 glVertex $w, $h; 2959 glVertex $w, $h;
2473 glVertex $w, 0; 2960 glVertex $w, 0;
2474 glEnd; 2961 glEnd;
2475 2962
2476 glTranslate 2 - 0.375, 2 - 0.375; 2963 glTranslate 2 - 0.375, 2 - 0.375;
2964
2477 $self->SUPER::_draw; 2965 $self->SUPER::_draw;
2478} 2966}
2479 2967
2480############################################################################# 2968#############################################################################
2481 2969
… …
2486use CFClient::OpenGL; 2974use CFClient::OpenGL;
2487 2975
2488sub new { 2976sub new {
2489 my $class = shift; 2977 my $class = shift;
2490 2978
2491 $class->SUPER::new ( 2979 my $self = $class->SUPER::new (
2492 aspect => 1, 2980 aspect => 1,
2981 can_events => 0,
2493 @_, 2982 @_,
2494 ) 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
2495} 3000}
2496 3001
2497sub size_request { 3002sub size_request {
2498 (32, 8) 3003 (32, 8)
2499} 3004}
2500 3005
3006sub update {
3007 my ($self) = @_;
3008
3009 return unless $self->{visible};
3010
3011 $self->SUPER::update;
3012}
3013
2501sub _draw { 3014sub _draw {
2502 my ($self) = @_; 3015 my ($self) = @_;
2503 3016
2504 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
2505 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 3028 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2506 3029
2507 # TODO animation
2508 if ($tex) { 3030 if ($tex) {
2509 glEnable GL_TEXTURE_2D; 3031 glEnable GL_TEXTURE_2D;
2510 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3032 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2511 glColor 1, 1, 1, 1; 3033 glColor 0, 0, 0, 1;
2512 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3034 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2513 glDisable GL_TEXTURE_2D; 3035 glDisable GL_TEXTURE_2D;
2514 } 3036 }
2515} 3037}
2516 3038
3039sub destroy {
3040 my ($self) = @_;
3041
3042 $self->{timer}->cancel
3043 if $self->{timer};
3044
3045 $self->SUPER::destroy;
3046}
3047
2517############################################################################# 3048#############################################################################
2518 3049
2519package CFClient::UI::InventoryItem; 3050package CFClient::UI::Buttonbar;
2520 3051
2521our @ISA = CFClient::UI::HBox::; 3052our @ISA = CFClient::UI::HBox::;
2522 3053
2523sub _item_to_desc { 3054# TODO: should actualyl wrap buttons and other goodies.
2524 my ($item) = @_;
2525
2526 my $desc =
2527 $item->{nrof} < 2
2528 ? $item->{name}
2529 : "$item->{nrof} $item->{name_pl}";
2530
2531 $item->{flags} & Crossfire::Protocol::F_OPEN
2532 and $desc .= " (open)";
2533 $item->{flags} & Crossfire::Protocol::F_APPLIED
2534 and $desc .= " (applied)";
2535 $item->{flags} & Crossfire::Protocol::F_UNPAID
2536 and $desc .= " (unpaid)";
2537 $item->{flags} & Crossfire::Protocol::F_MAGIC
2538 and $desc .= " (magic)";
2539 $item->{flags} & Crossfire::Protocol::F_CURSED
2540 and $desc .= " (cursed)";
2541 $item->{flags} & Crossfire::Protocol::F_DAMNED
2542 and $desc .= " (damned)";
2543 $item->{flags} & Crossfire::Protocol::F_LOCKED
2544 and $desc .= " *";
2545
2546 $desc
2547}
2548
2549sub new {
2550 my $class = shift;
2551
2552 my %args = @_;
2553
2554 my $item = delete $args{item};
2555
2556 my $desc = _item_to_desc ($item);
2557
2558 my $self = $class->SUPER::new (
2559 can_hover => 1,
2560 can_events => 1,
2561 tooltip => ((CFClient::UI::Label::escape $desc)
2562 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2563 connect_button_down => sub {
2564 my ($self, $ev, $x, $y) = @_;
2565
2566 # todo: maybe put examine on 1? but should just be a tooltip :(
2567 if ($ev->{button} == 1) {
2568 my $targ = $::CONN->{player}{tag};
2569
2570 if ($item->{container} == $::CONN->{player}{tag}) {
2571 $targ = $main::OPENCONT;
2572 }
2573
2574 $::CONN->send ("move $targ $item->{tag} 0");
2575 } elsif ($ev->{button} == 2) {
2576 $::CONN->send ("apply $item->{tag}");
2577 } elsif ($ev->{button} == 3) {
2578 my @menu_items = (
2579 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2580 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2581 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2582 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2583 [
2584 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2585 sub { $::CONN->send ("lock $item->{tag}") },
2586 ],
2587 );
2588
2589 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2590 }
2591
2592 1
2593 },
2594 %args
2595 );
2596
2597
2598 $self->add (new CFClient::UI::Face
2599 can_events => 0,
2600 face => $item->{face},
2601 anim => $item->{anim},
2602 animspeed => $item->{animspeed},
2603 );
2604
2605 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2606
2607 $self->{item} = $item;
2608
2609 $self->update_item;
2610
2611 $self
2612}
2613
2614sub update_item {
2615 my ($self) = @_;
2616
2617 my $desc = _item_to_desc ($self->{item});
2618
2619 $self->{name_lbl}->set_text ($desc);
2620}
2621
2622#############################################################################
2623
2624package CFClient::UI::Inventory;
2625
2626our @ISA = CFClient::UI::ScrolledWindow::;
2627
2628sub new {
2629 my $class = shift;
2630
2631 my $self = $class->SUPER::new (
2632 scrolled => (new CFClient::UI::VBox),
2633 @_,
2634 );
2635
2636 $self
2637}
2638
2639sub set_items {
2640 my ($self, $items) = @_;
2641
2642 $self->{scrolled}->clear;
2643 return unless $items;
2644
2645 my @items = sort {
2646 ($a->{type} <=> $b->{type})
2647 or ($a->{name} cmp $b->{name})
2648 } @$items;
2649
2650 $self->{real_items} = \@items;
2651
2652 for my $item (@items) {
2653 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2654 $item->update_item ();
2655 }
2656
2657 $self->{scrolled}->add (@items);
2658
2659# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2660}
2661
2662sub size_request {
2663 my ($self) = @_;
2664 ($self->{req_w}, $self->{req_h});
2665}
2666 3055
2667############################################################################# 3056#############################################################################
2668 3057
2669package CFClient::UI::Menu; 3058package CFClient::UI::Menu;
2670 3059
… …
2682 ); 3071 );
2683 3072
2684 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3073 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2685 3074
2686 for my $item (@{ $self->{items} }) { 3075 for my $item (@{ $self->{items} }) {
2687 my ($widget, $cb) = @$item; 3076 my ($widget, $cb, $tooltip) = @$item;
2688 3077
2689 # handle various types of items, only text for now 3078 # handle various types of items, only text for now
2690 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 {
2691 $widget = new CFClient::UI::Label 3094 $widget = new CFClient::UI::Label
2692 can_hover => 1, 3095 can_hover => 1,
2693 can_events => 1, 3096 can_events => 1,
2694 text => $widget; 3097 markup => $widget,
3098 tooltip => $tooltip;
3099 }
2695 } 3100 }
2696 3101
2697 $self->{item}{$widget} = $item; 3102 $self->{item}{$widget} = $item;
2698 3103
2699 $self->{vbox}->add ($widget); 3104 $self->{vbox}->add ($widget);
… …
2711 # maybe save $GRAB? must be careful about events... 3116 # maybe save $GRAB? must be careful about events...
2712 $GRAB = $self; 3117 $GRAB = $self;
2713 $self->{button} = $ev->{button}; 3118 $self->{button} = $ev->{button};
2714 3119
2715 $self->show; 3120 $self->show;
2716 $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);
2717} 3122}
2718 3123
2719sub mouse_motion { 3124sub invoke_mouse_motion {
2720 my ($self, $ev, $x, $y) = @_; 3125 my ($self, $ev, $x, $y) = @_;
2721 3126
2722 # TODO: should use vbox->find_widget or so 3127 # TODO: should use vbox->find_widget or so
2723 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3128 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2724 $self->{hover} = $self->{item}{$HOVER}; 3129 $self->{hover} = $self->{item}{$HOVER};
2725}
2726 3130
3131 0
3132}
3133
2727sub button_up { 3134sub invoke_button_up {
2728 my ($self, $ev, $x, $y) = @_; 3135 my ($self, $ev, $x, $y) = @_;
2729 3136
2730 if ($ev->{button} == $self->{button}) { 3137 if ($ev->{button} == $self->{button}) {
2731 undef $GRAB; 3138 undef $GRAB;
2732 $self->hide; 3139 $self->hide;
2733 3140
2734 $self->emit ("popdown"); 3141 $self->emit ("popdown");
2735 $self->{hover}[1]->() if $self->{hover}; 3142 $self->{hover}[1]->() if $self->{hover};
3143 } else {
3144 return 0
3145 }
3146
2736 } 3147 1
2737} 3148}
2738 3149
2739############################################################################# 3150#############################################################################
2740 3151
2741package CFClient::UI::Statusbox; 3152package CFClient::UI::Multiplexer;
2742 3153
2743our @ISA = CFClient::UI::VBox::; 3154our @ISA = CFClient::UI::Container::;
2744 3155
2745sub new { 3156sub new {
2746 my $class = shift; 3157 my $class = shift;
2747 3158
2748 $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 (
2749 fontsize => 0.8, 3338 fontsize => 0.8,
2750 @_, 3339 @_,
2751 ) 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
2752} 3347}
2753 3348
2754sub reorder { 3349sub reorder {
2755 my ($self) = @_; 3350 my ($self) = @_;
2756 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} };
2757 3357
2758 while (my ($k, $v) = each %{ $self->{item} }) { 3358 while (my ($k, $v) = each %{ $self->{item} }) {
2759 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3359 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2760 } 3360 }
2761 3361
… …
2764 my @items = sort { 3364 my @items = sort {
2765 $a->{pri} <=> $b->{pri} 3365 $a->{pri} <=> $b->{pri}
2766 or $b->{id} <=> $a->{id} 3366 or $b->{id} <=> $a->{id}
2767 } values %{ $self->{item} }; 3367 } values %{ $self->{item} };
2768 3368
3369 $self->{timer}->interval (1);
3370
2769 my $count = 10 + 1; 3371 my $count = 10 + 1;
2770 for my $item (@items) { 3372 for my $item (@items) {
2771 last unless --$count; 3373 last unless --$count;
2772 3374
2773 push @widgets, $item->{label} ||= do { 3375 my $label = $item->{label} ||= do {
2774 # TODO: doesn't handle markup well (read as: at all) 3376 # TODO: doesn't handle markup well (read as: at all)
2775 my $short = $item->{count} > 1 3377 my $short = $item->{count} > 1
2776 ? "<b>$item->{count} ×</b> $item->{text}" 3378 ? "<b>$item->{count} ×</b> $item->{text}"
2777 : $item->{text}; 3379 : $item->{text};
2778 3380
2779 my $fontsize = $item->{fontsize} || $self->{fontsize};
2780
2781 for ($short) { 3381 for ($short) {
2782 s/^\s+//; 3382 s/^\s+//;
2783 s/\s+/ /g; 3383 s/\s+/ /g;
2784 my $len = int 40 / $fontsize;
2785 substr $_, $len, length, "…" if $len < length;
2786 } 3384 }
2787 3385
2788 new CFClient::UI::Label 3386 new CFClient::UI::Label
2789 markup => $short, 3387 markup => $short,
2790 tooltip => $item->{tooltip}, 3388 tooltip => $item->{tooltip},
2791 tooltip_font => $::FONT_PROP, 3389 tooltip_font => $::FONT_PROP,
2792 tooltip_width => 0.67, 3390 tooltip_width => 0.67,
2793 fontsize => $fontsize, 3391 fontsize => $item->{fontsize} || $self->{fontsize},
3392 max_w => $::WIDTH * 0.44,
2794 fg => $item->{fg}, 3393 fg => [@{ $item->{fg} }],
2795 can_events => 1, 3394 can_events => 1,
2796 can_hover => 1 3395 can_hover => 1
2797 }; 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;
2798 } 3409 }
2799 3410
2800 $self->clear; 3411 $self->clear;
2801 $self->SUPER::add (reverse @widgets); 3412 $self->SUPER::add (reverse @widgets);
2802} 3413}
… …
2805 my ($self, $text, %arg) = @_; 3416 my ($self, $text, %arg) = @_;
2806 3417
2807 $text =~ s/^\s+//; 3418 $text =~ s/^\s+//;
2808 $text =~ s/\s+$//; 3419 $text =~ s/\s+$//;
2809 3420
3421 return unless $text;
3422
2810 my $timeout = time + ((delete $arg{timeout}) || 60); 3423 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2811 3424
2812 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3425 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2813 3426
2814 if (my $item = $self->{item}{$group}) { 3427 if (my $item = $self->{item}{$group}) {
2815 if ($item->{text} eq $text) { 3428 if ($item->{text} eq $text) {
2816 $item->{count}++; 3429 $item->{count}++;
2817 } else { 3430 } else {
2818 $item->{count} = 1; 3431 $item->{count} = 1;
2819 $item->{text} = $item->{tooltip} = $text; 3432 $item->{text} = $item->{tooltip} = $text;
2820 } 3433 }
2821 $item->{id} = ++$self->{id}; 3434 $item->{id} += 0.2;#d#
2822 $item->{timeout} = $timeout; 3435 $item->{timeout} = $timeout;
2823 delete $item->{label}; 3436 delete $item->{label};
2824 } else { 3437 } else {
2825 $self->{item}{$group} = { 3438 $self->{item}{$group} = {
2826 id => ++$self->{id}, 3439 id => ++$self->{id},
… …
2832 count => 1, 3445 count => 1,
2833 %arg, 3446 %arg,
2834 }; 3447 };
2835 } 3448 }
2836 3449
3450 $ROOT->on_refresh (reorder => sub {
3451 $self->reorder;
3452 });
3453}
3454
3455sub reconfigure {
3456 my ($self) = @_;
3457
3458 delete $_->{label}
3459 for values %{ $self->{item} || {} };
3460
2837 $self->reorder; 3461 $self->reorder;
3462 $self->SUPER::reconfigure;
3463}
3464
3465sub destroy {
3466 my ($self) = @_;
3467
3468 $self->{timer}->cancel;
3469
3470 $self->SUPER::destroy;
2838} 3471}
2839 3472
2840############################################################################# 3473#############################################################################
2841 3474
2842package CFClient::UI::Root; 3475package CFClient::UI::Inventory;
2843 3476
2844our @ISA = CFClient::UI::Container::; 3477our @ISA = CFClient::UI::Table::;
2845
2846use CFClient::OpenGL;
2847 3478
2848sub new { 3479sub new {
2849 my $class = shift; 3480 my $class = shift;
2850 3481
2851 $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 => [],
2852 @_, 3527 @_,
2853 ) 3528 )
2854} 3529}
2855 3530
2856sub configure { 3531my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
2857 my ($self, $x, $y, $w, $h) = @_;
2858 3532
2859 $self->{w} = $w; 3533my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
2860 $self->{h} = $h; 3534 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
2861} 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");
2862 3543
2863sub 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 {
2864 my ($self) = @_; 3617 my ($self, $spell) = @_;
2865 3618
2866 $self->size_allocate ($self->{w}, $self->{h}) 3619 $self->{spell}->{$spell->{name}} = $spell;
2867 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
2868} 3658}
2869 3659
2870sub size_request { 3660sub size_request {
2871 my ($self) = @_; 3661 my ($self) = @_;
2872 3662
2873 ($self->{w}, $self->{h}) 3663 ($self->{w}, $self->{h})
2874} 3664}
2875 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
2876sub size_allocate { 3680sub invoke_size_allocate {
2877 my ($self, $w, $h) = @_; 3681 my ($self, $w, $h) = @_;
2878
2879 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2880 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2881
2882 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2883 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2884 3682
2885 for my $child ($self->children) { 3683 for my $child ($self->children) {
2886 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)};
2887 3685
2888 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3686 $X = $child->{force_x} if exists $child->{force_x};
2889 if exists $child->{req_x}; 3687 $Y = $child->{force_y} if exists $child->{force_y};
2890 3688
2891 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3689 $X = _to_pixel $X, $W, $self->{w};
2892 if exists $child->{req_y}; 3690 $Y = _to_pixel $Y, $H, $self->{h};
2893
2894 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2895 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2896 3691
2897 $child->configure ($X, $Y, $W, $H); 3692 $child->configure ($X, $Y, $W, $H);
2898 } 3693 }
3694
3695 1
2899} 3696}
2900 3697
2901sub coord2local { 3698sub coord2local {
2902 my ($self, $x, $y) = @_; 3699 my ($self, $x, $y) = @_;
2903 3700
… …
2911} 3708}
2912 3709
2913sub update { 3710sub update {
2914 my ($self) = @_; 3711 my ($self) = @_;
2915 3712
2916 $self->check_size;
2917 $::WANT_REFRESH++; 3713 $::WANT_REFRESH++;
2918} 3714}
2919 3715
2920sub add { 3716sub add {
2921 my ($self, @children) = @_; 3717 my ($self, @children) = @_;
2922 3718
2923 for my $child (@children) {
2924 $child->{toplevel} = 1; 3719 $_->{is_toplevel} = 1
2925 3720 for @children;
2926 # integerise window positions
2927 $child->{x} = int $child->{x};
2928 $child->{y} = int $child->{y};
2929 }
2930 3721
2931 $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 }
2932} 3738}
2933 3739
2934sub on_refresh { 3740sub on_refresh {
2935 my ($self, $id, $cb) = @_; 3741 my ($self, $id, $cb) = @_;
2936 3742
… …
2949 while ($self->{refresh_hook}) { 3755 while ($self->{refresh_hook}) {
2950 $_->() 3756 $_->()
2951 for values %{delete $self->{refresh_hook}}; 3757 for values %{delete $self->{refresh_hook}};
2952 } 3758 }
2953 3759
2954 if ($self->{check_size}) { 3760 if ($self->{realloc}) {
2955 my @queue = ([], []); 3761 my %queue;
3762 my @queue;
3763 my $widget;
2956 3764
2957 for (;;) { 3765 outer:
2958 if ($self->{check_size}) { 3766 while () {
2959 # heuristic: check containers last 3767 if (my $realloc = delete $self->{realloc}) {
2960 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3768 for $widget (values %$realloc) {
2961 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 }
2962 } 3775 }
2963 3776
2964 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3777 while () {
3778 @queue or last outer;
2965 3779
2966 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3780 $widget = pop @{ $queue[-1] || [] }
2967 ? @$widget{qw(user_w user_h)} 3781 and last;
2968 : $widget->size_request;
2969
2970 if (delete $widget->{force_alloc}
2971 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2972 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2973 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}) {
2974 $widget->{req_w} = $w; 3801 $widget->{req_w} = $w;
2975 $widget->{req_h} = $h; 3802 $widget->{req_h} = $h;
2976 3803
2977 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3804 $self->{size_alloc}{$widget+0} = $widget;
2978 3805
2979 $widget->{parent}->check_size
2980 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 }
2981 } 3813 }
3814
3815 delete $self->{realloc}{$widget+0};
2982 } 3816 }
2983 } 3817 }
2984 3818
2985 while ($self->{size_alloc}) { 3819 while (my $size_alloc = delete $self->{size_alloc}) {
2986 for (values %{delete $self->{size_alloc}}) { 3820 my @queue = sort { $b->{visible} <=> $a->{visible} }
2987 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)};
2988 3827
2989 $w = 0 if $w < 0; 3828 $w = 0 if $w < 0;
2990 $h = 0 if $h < 0; 3829 $h = 0 if $h < 0;
2991 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
2992 $widget->{w} = $w; 3844 $widget->{w} = $w;
2993 $widget->{h} = $h; 3845 $widget->{h} = $h;
2994 $widget->size_allocate ($w, $h); 3846
2995 $widget->emit (size_allocate => $w, $h); 3847 $widget->emit (size_allocate => $w, $h);
3848 }
2996 } 3849 }
2997 } 3850 }
2998 3851
2999 while ($self->{post_alloc_hook}) { 3852 while ($self->{post_alloc_hook}) {
3000 $_->() 3853 $_->()
3001 for values %{delete $self->{post_alloc_hook}}; 3854 for values %{delete $self->{post_alloc_hook}};
3002 } 3855 }
3003 3856
3857
3004 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3858 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3005 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3859 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3006 glClear GL_COLOR_BUFFER_BIT; 3860 glClear GL_COLOR_BUFFER_BIT;
3007 3861
3008 glMatrixMode GL_PROJECTION; 3862 glMatrixMode GL_PROJECTION;
3009 glLoadIdentity; 3863 glLoadIdentity;
3010 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3864 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3011 glMatrixMode GL_MODELVIEW; 3865 glMatrixMode GL_MODELVIEW;
3012 glLoadIdentity; 3866 glLoadIdentity;
3013 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
3014 $self->_draw; 3875 $self->_draw;
3015} 3876}
3016 3877
3017############################################################################# 3878#############################################################################
3018 3879
3019package CFClient::UI; 3880package CFClient::UI;
3020 3881
3021$ROOT = new CFClient::UI::Root; 3882$ROOT = new CFClient::UI::Root;
3022$TOOLTIP = new CFClient::UI::Tooltip; 3883$TOOLTIP = new CFClient::UI::Tooltip z => 900;
3023 3884
30241 38851
3025 3886

Diff Legend

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