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.224 by elmex, Tue May 23 20:00:55 2006 UTC vs.
Revision 1.475 by root, Sun Jan 11 22:15:23 2009 UTC

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

Diff Legend

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