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.161 by root, Mon Apr 24 03:43:51 2006 UTC vs.
Revision 1.367 by root, Fri Apr 27 00:59:14 2007 UTC

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

Diff Legend

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