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.222 by root, Mon May 22 03:59:51 2006 UTC vs.
Revision 1.309 by elmex, Wed Jun 21 12:59:23 2006 UTC

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

Diff Legend

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