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

Diff Legend

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