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

Diff Legend

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