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.153 by root, Sun Apr 23 02:14:33 2006 UTC vs.
Revision 1.366 by root, Mon Apr 23 19:17:41 2007 UTC

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

Diff Legend

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