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

Diff Legend

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