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

Diff Legend

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