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

Diff Legend

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