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

Diff Legend

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