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

Diff Legend

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