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.255 by root, Mon May 29 02:01:56 2006 UTC vs.
Revision 1.345 by root, Sun Aug 13 21:46:10 2006 UTC

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

Diff Legend

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