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.368 by root, Mon Jun 25 05:43:37 2007 UTC

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

Diff Legend

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