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

Diff Legend

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