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.250 by root, Sun May 28 02:31:03 2006 UTC vs.
Revision 1.354 by root, Sat Nov 18 23:31:23 2006 UTC

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

Diff Legend

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