ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.257 by root, Tue May 30 02:22:02 2006 UTC vs.
Revision 1.372 by root, Sun Jul 15 22:13:43 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines