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.216 by root, Fri May 19 16:43:57 2006 UTC vs.
Revision 1.327 by root, Mon Jul 17 01:41:53 2006 UTC

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

Diff Legend

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