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.170 by root, Mon Apr 24 11:45:17 2006 UTC vs.
Revision 1.462 by root, Thu Mar 20 22:28:33 2008 UTC

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

Diff Legend

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