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.36 by elmex, Sun Apr 9 17:39:56 2006 UTC vs.
Revision 1.66 by root, Tue Apr 11 14:36:02 2006 UTC

1package Crossfire::Client::Widget; 1package CFClient::Widget;
2 2
3use strict; 3use strict;
4 4
5use Scalar::Util; 5use Scalar::Util;
6 6
7use SDL::OpenGL; 7use SDL::OpenGL;
8use SDL::OpenGL::Constants; 8use SDL::OpenGL::Constants;
9 9
10our $FOCUS; # the widget with current focus 10use CFClient;
11
12our ($FOCUS, $HOVER, $GRAB); # various widgets
13
14our $TOPLEVEL;
15our $BUTTON_STATE;
11 16
12# class methods for events 17# class methods for events
13sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS } 18sub feed_sdl_key_down_event {
14sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS } 19 $FOCUS->key_down ($_[0]) if $FOCUS;
20}
21
22sub feed_sdl_key_up_event {
23 $FOCUS->key_up ($_[0]) if $FOCUS;
24}
25
15sub feed_sdl_button_down_event { } 26sub feed_sdl_button_down_event {
27 my ($ev) = @_;
28 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
29
30 if (!$BUTTON_STATE) {
31 my $widget = $TOPLEVEL->find_widget ($x, $y);
32
33 $GRAB = $widget;
34 $GRAB->update if $GRAB;
35 }
36
37 $BUTTON_STATE |= 1 << ($ev->button - 1);
38
39 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;
40}
41
16sub feed_sdl_button_up_event { } 42sub feed_sdl_button_up_event {
43 my ($ev) = @_;
44 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
45
46 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
47
48 $BUTTON_STATE &= ~(1 << ($ev->button - 1));
49
50 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;
51
52 if (!$BUTTON_STATE) {
53 my $grab = $GRAB; undef $GRAB;
54 $grab->update if $grab;
55 $GRAB->update if $GRAB;
56 }
57}
58
59sub feed_sdl_motion_event {
60 my ($ev) = @_;
61 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
62
63 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
64
65 if ($widget != $HOVER) {
66 my $hover = $HOVER; $HOVER = $widget;
67
68 $hover->update if $hover;
69 $HOVER->update if $HOVER;
70 }
71
72 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;
73}
17 74
18sub new { 75sub new {
19 my $class = shift; 76 my $class = shift;
20 77
21 bless { @_ }, $class 78 bless {
79 x => 0,
80 y => 0,
81 z => 0,
82 @_
83 }, $class
22} 84}
23 85
24sub move { 86sub move {
25 my ($self, $x, $y, $z) = @_; 87 my ($self, $x, $y, $z) = @_;
26 $self->{x} = $x; 88 $self->{x} = $x;
… …
37 Carp::confess "size_request is abtract"; 99 Carp::confess "size_request is abtract";
38} 100}
39 101
40sub size_allocate { 102sub size_allocate {
41 my ($self, $w, $h) = @_; 103 my ($self, $w, $h) = @_;
104
42 $self->w ($w); 105 $self->{w} = $w;
43 $self->h ($h); 106 $self->{h} = $h;
107}
108
109# translate global koordinates to local coordinate system
110sub translate {
111 my ($self, $x, $y) = @_;
112
113 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y});
44} 114}
45 115
46sub focus_in { 116sub focus_in {
47 my ($widget) = @_; 117 my ($self) = @_;
48 $FOCUS = $widget; 118
119 my $focus = $FOCUS; $FOCUS = $self;
120 $focus->update if $focus;
121 $FOCUS->update;
49} 122}
50 123
51sub focus_out { 124sub focus_out {
52 my ($widget) = @_; 125 my ($self) = @_;
53}
54 126
55sub key_down { 127 return unless $FOCUS == $self;
56 my ($widget, $sdlev) = @_;
57}
58 128
59sub key_up { 129 my $focus = $FOCUS; undef $FOCUS;
60 my ($widget, $sdlev) = @_; 130 $focus->update if $focus; #?
61} 131}
62 132
133sub mouse_motion { }
134sub button_up { }
63sub button_down { 135sub button_down { }
64 my ($widget, $sdlev) = @_; 136sub key_down { }
65} 137sub key_up { }
66 138
67sub button_up {
68 my ($widget, $sdlev) = @_;
69}
70
71sub w { $_[0]->{w} = $_[1] if $_[1]; $_[0]->{w} } 139sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
72sub h { $_[0]->{h} = $_[1] if $_[1]; $_[0]->{h} } 140sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
73sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} } 141sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
74sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} } 142sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
75sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} } 143sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
76 144
77sub draw { 145sub draw {
78 my ($self) = @_; 146 my ($self) = @_;
79 147
80 glPushMatrix; 148 glPushMatrix;
81 glTranslate $self->{x}, $self->{y}, 0; 149 glTranslate $self->{x}, $self->{y}, 0;
82 $self->_draw; 150 $self->_draw;
151 if ($self == $HOVER) {
152 glColor 1, 1, 1, 0.4;
153 glEnable GL_BLEND;
154 glBegin GL_QUADS;
155 glVertex 0 , 0;
156 glVertex $self->{w}, 0;
157 glVertex $self->{w}, $self->{h};
158 glVertex 0 , $self->{h};
159 glEnd;
160 glDisable GL_BLEND;
161 }
83 glPopMatrix; 162 glPopMatrix;
84} 163}
85 164
86sub _draw { 165sub _draw {
87 my ($widget) = @_; 166 my ($self) = @_;
167
168 warn "no draw defined for $self\n";
88} 169}
89 170
90sub bbox { 171sub bbox {
91 my ($self) = @_; 172 my ($self) = @_;
92 my ($w, $h) = $self->size_request; 173 my ($w, $h) = $self->size_request;
… …
96 $self->{x} = $w, 177 $self->{x} = $w,
97 $self->{y} = $h 178 $self->{y} = $h
98 ) 179 )
99} 180}
100 181
182sub find_widget {
183 my ($self, $x, $y) = @_;
184
185 return $self
186 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
187 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
188
189 ()
190}
191
101sub del_parent { $_[0]->{parent} = undef } 192sub del_parent { $_[0]->{parent} = undef }
102 193
103sub set_parent { 194sub set_parent {
104 my ($self, $par) = @_; 195 my ($self, $par) = @_;
105 196
… …
122 my ($self) = @_; 213 my ($self) = @_;
123 214
124 #$self->deactivate; 215 #$self->deactivate;
125} 216}
126 217
127package Crossfire::Client::Widget::Bin; 218#############################################################################
128 219
220package CFClient::Widget::Empty;
221
129our @ISA = Crossfire::Client::Widget::; 222our @ISA = CFClient::Widget::;
130 223
131sub add { $_[0]->{child} = $_[1]; $_[1]->set_parent ($_[0]); $_[1]->{expand} = $_[2] } 224sub size_request {
132sub get { $_[0]->{child} } 225 (0, 0)
226}
227
228sub draw {
229}
230
231#############################################################################
232
233package CFClient::Widget::Container;
234
235our @ISA = CFClient::Widget::;
236
237sub new {
238 my ($class, %arg) = @_;
239
240 my $children = delete $arg{children} || [];
241
242 my $self = $class->SUPER::new (children => [], %arg);
243 $self->add ($_) for @$children;
244
245 $self
246}
247
248sub add {
249 my ($self, $chld, $expand) = @_;
250
251 $chld->{expand} = $expand;
252 $chld->set_parent ($self);
253
254 $self->{children} = [
255 sort { $a->{z} <=> $b->{z} }
256 @{$self->{children}}, $chld
257 ];
258
259 $self->size_allocate ($self->{w}, $self->{h})
260 if $self->{w}; #TODO: check for "realised state"
261}
133 262
134sub remove { 263sub remove {
135 my ($self, $chld) = @_; 264 my ($self, $widget) = @_;
136 delete $self->{child} 265
137 if $self->{child} == $chld; 266 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
267
268 $self->size_allocate ($self->{w}, $self->{h});
138} 269}
270
271sub find_widget {
272 my ($self, $x, $y) = @_;
273
274 $x -= $self->{x};
275 $y -= $self->{y};
276
277 my $res;
278
279 for (reverse @{ $self->{children} }) {
280 $res = $_->find_widget ($x, $y)
281 and return $res;
282 }
283
284 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
285}
286
287sub _draw {
288 my ($self) = @_;
289
290 $_->draw for @{$self->{children}};
291}
292
293#############################################################################
294
295package CFClient::Widget::Bin;
296
297our @ISA = CFClient::Widget::Container::;
298
299sub new {
300 my ($class, %arg) = @_;
301
302 my $child = (delete $arg{child}) || new CFClient::Widget::Empty::;
303
304 $class->SUPER::new (children => [$child], %arg)
305}
306
307sub add {
308 my ($self, $widget) = @_;
309
310 $self->{children} = [];
311
312 $self->SUPER::add ($widget);
313}
314
315sub remove {
316 my ($self, $widget) = @_;
317
318 $self->SUPER::remove ($widget);
319
320 $self->{children} = [new CFClient::Widget::Empty]
321 unless @{$self->{children}};
322}
323
324sub child { $_[0]->{children}[0] }
139 325
140sub size_request { 326sub size_request {
141 $_[0]->{child}->size_request if $_[0]->{child} 327 $_[0]{children}[0]->size_request if $_[0]{children}[0];
142} 328}
329
143sub size_allocate { 330sub size_allocate {
144 my ($self, $w, $h) = @_; 331 my ($self, $w, $h) = @_;
332
145 $self->SUPER::size_allocate ($w, $h); 333 $self->SUPER::size_allocate ($w, $h);
146 $self->{child}->size_allocate ($w, $h) 334 $self->{children}[0]->size_allocate ($w, $h)
147 if $self->{child} 335 if $self->{children}[0]
148} 336}
149 337
150sub _draw { 338#############################################################################
151 my ($self) = @_;
152 339
153 $self->{child}->draw; 340package CFClient::Widget::Window;
154}
155 341
156package Crossfire::Client::Widget::Toplevel;
157
158our @ISA = Crossfire::Client::Widget::; 342our @ISA = CFClient::Widget::Bin::;
159 343
160use SDL::OpenGL; 344use SDL::OpenGL;
161 345
162sub add { 346sub new {
163 my ($self, $chld) = @_; 347 my ($class, %arg) = @_;
164 348
165 push @{$self->{childs}}, $chld; 349 my $self = $class->SUPER::new (%arg);
166 @{$self->{childs}} =
167 sort { $a->{z} <=> $b->{z} }
168 @{$self->{childs}};
169
170 $chld->set_parent ($self);
171 $chld->size_allocate ($chld->size_request);
172}
173
174sub remove {
175 my ($self, $chld) = @_;
176 @{$self->{childs}} =
177 sort { $a->{z} <=> $b->{z} }
178 grep { $_ && $_ != $_[0] }
179 @{$self->{childs}}
180} 350}
181 351
182sub update { 352sub update {
183 my ($self) = @_; 353 my ($self) = @_;
184 ::refresh ();
185}
186 354
187sub _draw { 355 # we want to do this delayed...
188 my ($self) = @_;
189
190 $_->draw for @{$self->{childs}};
191}
192
193package Crossfire::Client::Widget::Window;
194
195our @ISA = Crossfire::Client::Widget::Bin::;
196
197use SDL::OpenGL;
198
199sub add {
200 my ($self, $chld) = @_;
201 warn "ADD $chld\n";
202 $self->SUPER::add ($chld);
203 $chld->set_parent ($self);
204}
205
206sub remove {
207 my ($self) = @_;
208 # TODO FIXME: removing a child from a window will crash, see render_chld
209 # $self->update;
210}
211
212sub update {
213 my ($self) = @_;
214 $self->render_chld; 356 $self->render_chld;
357 $self->SUPER::update;
215} 358}
216 359
217sub render_chld { 360sub render_chld {
218 my ($self) = @_; 361 my ($self) = @_;
219 my $chld = $self->get;
220 my ($w, $h) = $self->size_request;
221 362
222 require Carp;
223 Carp::cluck "RENDERCHI $w $h";
224 warn "RENDERCHI $w $h\n";
225 $self->{texture} = 363 $self->{texture} =
226 Crossfire::Client::Texture->new_from_opengl ( 364 CFClient::Texture->new_from_opengl (
227 $w, $h, sub { $chld->draw } 365 $self->{w}, $self->{h}, sub { $self->child->draw }
228 ); 366 );
229 $self->{texture}->upload;
230}
231
232sub size_request {
233 my ($self) = @_;
234 ($self->w, $self->h)
235} 367}
236 368
237sub size_allocate { 369sub size_allocate {
238 my ($self, $w, $h) = @_; 370 my ($self, $w, $h) = @_;
239 371
240 $self->w ($w); 372 $self->{w} = $w;
241 $self->h ($h); 373 $self->{h} = $h;
374
242 $self->get->size_allocate ($w, $h); 375 $self->child->size_allocate ($w, $h);
243 376
244 $self->update; #TODO: Move this to the size_request event propably? 377 $self->render_chld;
245} 378}
246 379
247sub _draw { 380sub _draw {
248 my ($self) = @_; 381 my ($self) = @_;
249 382
… …
253 or return; 386 or return;
254 387
255 glEnable GL_BLEND; 388 glEnable GL_BLEND;
256 glEnable GL_TEXTURE_2D; 389 glEnable GL_TEXTURE_2D;
257 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 390 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
258 glBindTexture GL_TEXTURE_2D, $tex->{name};
259 391
260 glBegin GL_QUADS; 392 $tex->draw_quad (0, 0, $w, $h);
261 glTexCoord 0, 0; glVertex 0, 0;
262 glTexCoord 0, 1; glVertex 0, $h;
263 glTexCoord 1, 1; glVertex $w, $h;
264 glTexCoord 1, 0; glVertex $w, 0;
265 glEnd;
266 393
267 glDisable GL_BLEND; 394 glDisable GL_BLEND;
268 glDisable GL_TEXTURE_2D; 395 glDisable GL_TEXTURE_2D;
269} 396}
270 397
398#############################################################################
399
271package Crossfire::Client::Widget::Frame; 400package CFClient::Widget::Frame;
272 401
273our @ISA = Crossfire::Client::Widget::Bin::; 402our @ISA = CFClient::Widget::Bin::;
274 403
275use SDL::OpenGL; 404use SDL::OpenGL;
276 405
277sub size_request { 406sub size_request {
278 my ($self) = @_; 407 my ($self) = @_;
279 my $chld = $self->get 408 my $chld = $self->child
280 or return (0, 0); 409 or return (0, 0);
281 410
282 $chld->move (2, 2); 411 $chld->move (2, 2);
283 412
284 map { $_ + 4 } $chld->size_request; 413 map { $_ + 4 } $chld->size_request;
285} 414}
286 415
287sub size_allocate { 416sub size_allocate {
288 my ($self, $w, $h) = @_; 417 my ($self, $w, $h) = @_;
289 418
290 $self->w ($w); 419 $self->{w} = $w;
291 $self->h ($h); 420 $self->{h} = $h;
292 421
293 $self->get->size_allocate ($w - 4, $h - 4); 422 $self->child->size_allocate ($w - 4, $h - 4);
294 $self->get->move (2, 2); 423 $self->child->move (2, 2);
295} 424}
296 425
297sub _draw { 426sub _draw {
298 my ($self) = @_; 427 my ($self) = @_;
299 428
300 my $chld = $self->get; 429 my $chld = $self->child;
301 430
302 my ($w, $h) = $chld->size_request; 431 my ($w, $h) = $chld->size_request;
303 432
304 glBegin GL_QUADS; 433 glBegin GL_QUADS;
305 glColor 0, 0, 0; 434 glColor 0, 0, 0;
306 glTexCoord 0, 0; glVertex 0 , 0; 435 glVertex 0 , 0;
307 glTexCoord 0, 1; glVertex 0 , $h + 4; 436 glVertex 0 , $h + 4;
308 glTexCoord 1, 1; glVertex $w + 4 , $h + 4; 437 glVertex $w + 4 , $h + 4;
309 glTexCoord 1, 0; glVertex $w + 4 , 0; 438 glVertex $w + 4 , 0;
310 glEnd; 439 glEnd;
311 440
312 $chld->draw; 441 $chld->draw;
313} 442}
314 443
444#############################################################################
445
315package Crossfire::Client::Widget::FancyFrame; 446package CFClient::Widget::FancyFrame;
316 447
317our @ISA = Crossfire::Client::Widget::Frame::; 448our @ISA = CFClient::Widget::Bin::;
318 449
319use SDL::OpenGL; 450use SDL::OpenGL;
320 451
321sub new { 452my @tex =
322 my ($self, $theme) = @_;
323 $self = $self->SUPER::new;
324
325 $self->{txts} = [
326 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ } 453 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
327 qw/d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png/ 454 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
328 ];
329 $self
330}
331 455
332sub size_request { 456sub size_request {
333 my ($self) = @_; 457 my ($self) = @_;
458
334 my ($w, $h) = $self->get->size_request; 459 my ($w, $h) = $self->SUPER::size_request;
335 460
336 $h += $self->{txts}->[1]->{height}; 461 $h += $tex[1]->{height};
337 $h += $self->{txts}->[4]->{height}; 462 $h += $tex[4]->{height};
338 $w += $self->{txts}->[2]->{width}; 463 $w += $tex[2]->{width};
339 $w += $self->{txts}->[3]->{width}; 464 $w += $tex[3]->{width};
340 465
341 ($w, $h) 466 ($w, $h)
342} 467}
343 468
344sub size_allocate { 469sub size_allocate {
345 my ($self, $w, $h) = @_; 470 my ($self, $w, $h) = @_;
346 471
347 $self->w ($w); 472 $self->SUPER::size_allocate ($w, $h);
348 $self->h ($h); 473
349 $h -= $self->{txts}->[1]->{height}; 474 $h -= $tex[1]->{height};
350 $h -= $self->{txts}->[4]->{height}; 475 $h -= $tex[4]->{height};
351 $w -= $self->{txts}->[2]->{width}; 476 $w -= $tex[2]->{width};
352 $w -= $self->{txts}->[3]->{width}; 477 $w -= $tex[3]->{width};
353 478
354 $h = $h < 0 ? 0 : $h; 479 $h = $h < 0 ? 0 : $h;
355 $w = $w < 0 ? 0 : $w; 480 $w = $w < 0 ? 0 : $w;
356 warn "CHILD:$w $h\n"; 481
482 my $child = $self->child;
483
357 $self->get->size_allocate ($w, $h); 484 $child->size_allocate ($w, $h);
358 $self->get->move ($self->{txts}->[3]->{width}, $self->{txts}->[1]->{height}); 485 $child->move ($tex[3]->{width}, $tex[1]->{height});
359} 486}
360 487
361sub _draw { 488sub _draw {
362 my ($self) = @_; 489 my ($self) = @_;
363 490
364 my ($w, $h) = ($self->w, $self->h); 491 my ($w, $h) = ($self->{w}, $self->{h});
365 my ($cw, $ch) = ($self->get->w, $self->get->h); 492 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
366 493
367 glEnable GL_BLEND; 494 glEnable GL_BLEND;
368 glEnable GL_TEXTURE_2D; 495 glEnable GL_TEXTURE_2D;
369 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 496 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
370 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 497 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
371 498
372 my $top = $self->{txts}->[1]; 499 my $top = $tex[1];
373 glBindTexture GL_TEXTURE_2D, $top->{name}; 500 $top->draw_quad (0, 0, $w, $top->{height});
374 501
375 glBegin GL_QUADS;
376 glTexCoord 0, 0; glVertex 0 , 0;
377 glTexCoord 0, 1; glVertex 0 , $top->{height};
378 glTexCoord 1, 1; glVertex $w , $top->{height};
379 glTexCoord 1, 0; glVertex $w , 0;
380 glEnd;
381
382 my $left = $self->{txts}->[3]; 502 my $left = $tex[3];
383 glBindTexture GL_TEXTURE_2D, $left->{name}; 503 $left->draw_quad (0, $top->{height}, $left->{width}, $ch);
384 504
385 glBegin GL_QUADS;
386 glTexCoord 0, 0; glVertex 0 , $top->{height};
387 glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch;
388 glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
389 glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
390 glEnd;
391
392 my $right = $self->{txts}->[2]; 505 my $right = $tex[2];
393 glBindTexture GL_TEXTURE_2D, $right->{name}; 506 $right->draw_quad ($w - $right->{width}, $top->{height}, $right->{width}, $ch);
394 507
395 glBegin GL_QUADS;
396 glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
397 glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
398 glTexCoord 1, 1; glVertex $w , $top->{height} + $ch;
399 glTexCoord 1, 0; glVertex $w , $top->{height};
400 glEnd;
401
402 my $bottom = $self->{txts}->[4]; 508 my $bottom = $tex[4];
403 glBindTexture GL_TEXTURE_2D, $bottom->{name}; 509 $bottom->draw_quad (0, $h - $bottom->{height}, $w, $bottom->{height});
404 510
405 glBegin GL_QUADS; 511 my $bg = $tex[0];
406 glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height};
407 glTexCoord 0, 1; glVertex 0 , $h;
408 glTexCoord 1, 1; glVertex $w , $h;
409 glTexCoord 1, 0; glVertex $w , $h - $bottom->{height};
410 glEnd;
411
412 my $bg = $self->{txts}->[0];
413 glBindTexture GL_TEXTURE_2D, $bg->{name}; 512 glBindTexture GL_TEXTURE_2D, $bg->{name};
414 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 513 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
415 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT; 514 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
416 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT; 515 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
417 516
418 my $rep_x = $cw / $bg->{width}; 517 my $rep_x = $cw / $bg->{width};
419 my $rep_y = $ch / $bg->{height}; 518 my $rep_y = $ch / $bg->{height};
420 519
421 glBegin GL_QUADS; 520 $bg->draw_quad ($left->{width}, $top->{height}, $cw, $ch);
422 glTexCoord 0, 0; glVertex $left->{width}, $top->{height};
423 glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch;
424 glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch;
425 glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height};
426 glEnd;
427 521
428 glDisable GL_BLEND; 522 glDisable GL_BLEND;
429 glDisable GL_TEXTURE_2D; 523 glDisable GL_TEXTURE_2D;
430 524
431 $self->get->draw; 525 $self->child->draw;
432 526
433} 527}
434 528
529#############################################################################
530
435package Crossfire::Client::Widget::Table; 531package CFClient::Widget::Table;
436 532
437our @ISA = Crossfire::Client::Widget::Bin::; 533our @ISA = CFClient::Widget::Bin::;
438 534
439use SDL::OpenGL; 535use SDL::OpenGL;
440 536
441sub add { 537sub add {
442 my ($self, $x, $y, $chld) = @_; 538 my ($self, $x, $y, $chld) = @_;
443 my $old_chld = $self->{childs}[$y][$x]; 539 my $old_chld = $self->{children}[$y][$x];
444 540
445 $self->{childs}[$y][$x] = $chld; 541 $self->{children}[$y][$x] = $chld;
446 $chld->set_parent ($self); 542 $chld->set_parent ($self);
447 $self->update; 543 $self->update;
448} 544}
449 545
450sub max_row_height { 546sub max_row_height {
451 my ($self, $row) = @_; 547 my ($self, $row) = @_;
452 548
453 my $hs = 0; 549 my $hs = 0;
454 for (my $xi = 0; $xi <= $#{$self->{childs}->[$row] || []}; $xi++) { 550 for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) {
455 my $c = $self->{childs}->[$row]->[$xi]; 551 my $c = $self->{children}->[$row]->[$xi];
456 if ($c) { 552 if ($c) {
457 my ($w, $h) = $c->size_request; 553 my ($w, $h) = $c->size_request;
458 if ($hs < $h) { $hs = $h } 554 if ($hs < $h) { $hs = $h }
459 } 555 }
460 } 556 }
… …
463 559
464sub max_col_width { 560sub max_col_width {
465 my ($self, $col) = @_; 561 my ($self, $col) = @_;
466 562
467 my $ws = 0; 563 my $ws = 0;
468 for (my $yi = 0; $yi <= $#{$self->{childs} || []}; $yi++) { 564 for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) {
469 my $c = ($self->{childs}->[$yi] || [])->[$col]; 565 my $c = ($self->{children}->[$yi] || [])->[$col];
470 if ($c) { 566 if ($c) {
471 my ($w, $h) = $c->size_request; 567 my ($w, $h) = $c->size_request;
472 if ($ws < $w) { $ws = $w } 568 if ($ws < $w) { $ws = $w }
473 } 569 }
474 } 570 }
… …
478sub size_request { 574sub size_request {
479 my ($self) = @_; 575 my ($self) = @_;
480 576
481 my ($hs, $ws) = (0, 0); 577 my ($hs, $ws) = (0, 0);
482 578
483 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 579 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
484 $hs += $self->max_row_height ($yi); 580 $hs += $self->max_row_height ($yi);
485 } 581 }
486 582
487 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 583 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
488 my $wm = 0; 584 my $wm = 0;
489 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 585 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
490 $wm += $self->max_col_width ($xi) 586 $wm += $self->max_col_width ($xi)
491 } 587 }
492 if ($ws < $wm) { $ws = $wm } 588 if ($ws < $wm) { $ws = $wm }
493 } 589 }
494 590
… …
497 593
498sub _draw { 594sub _draw {
499 my ($self) = @_; 595 my ($self) = @_;
500 596
501 my $y = 0; 597 my $y = 0;
502 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 598 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
503 my $x = 0; 599 my $x = 0;
504 600
505 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 601 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
506 602
507 my $c = $self->{childs}->[$yi]->[$xi]; 603 my $c = $self->{children}->[$yi]->[$xi];
508 if ($c) { 604 if ($c) {
509 $c->move ($x, $y, 0); #TODO: Move to size_request 605 $c->move ($x, $y, 0); #TODO: Move to size_request
510 $c->draw if $c; 606 $c->draw if $c;
511 } 607 }
512 608
… …
515 611
516 $y += $self->max_row_height ($yi); 612 $y += $self->max_row_height ($yi);
517 } 613 }
518} 614}
519 615
616#############################################################################
617
520package Crossfire::Client::Widget::VBox; 618package CFClient::Widget::VBox;
521 619
522our @ISA = Crossfire::Client::Widget::Bin::; 620our @ISA = CFClient::Widget::Container::;
523 621
524use SDL::OpenGL; 622use SDL::OpenGL;
525 623
526sub add {
527 my ($self, $chld, $expand) = @_;
528 push @{$self->{childs}}, $chld;
529 $chld->{expand} = $expand;
530 $chld->set_parent ($self);
531 $self->update;
532}
533
534sub size_request { 624sub size_request {
535 my ($self) = @_; 625 my ($self) = @_;
536 626
537 my ($hs, $ws) = (0, 0); 627 my @alloc = map [$_->size_request], @{$self->{children}};
538 for (@{$self->{childs} || []}) { 628
539 my ($w, $h) = $_->size_request;
540 $hs += $h;
541 if ($ws < $w) { $ws = $w }
542 } 629 (
543 630 (List::Util::max map $_->[0], @alloc),
544 return ($ws, $hs); 631 (List::Util::sum map $_->[1], @alloc),
632 )
545} 633}
546 634
547sub size_allocate { 635sub size_allocate {
548 my ($self, $w, $h) = @_; 636 my ($self, $w, $h) = @_;
549 637
… …
551 $self->h ($h); 639 $self->h ($h);
552 640
553 my $exp; 641 my $exp;
554 my @oth; 642 my @oth;
555 # find expand widget 643 # find expand widget
556 for (@{$self->{childs}}) { 644 for (@{$self->{children}}) {
557 if ($_->{expand}) { 645 if ($_->{expand}) {
558 $exp = $_; 646 $exp = $_;
559 last; 647 last;
560 } 648 }
561 push @oth, $_; 649 push @oth, $_;
… …
569 $oh += $h; 657 $oh += $h;
570 if ($ow < $w) { $ow = $w } 658 if ($ow < $w) { $ow = $w }
571 } 659 }
572 660
573 my $y = 0; 661 my $y = 0;
574 for (@{$self->{childs}}) { 662 for (@{$self->{children}}) {
575 $_->move (0, $y); 663 $_->move (0, $y);
576 664
577 if ($_ == $exp) { 665 if ($_ == $exp) {
578 $_->size_allocate ($w, $h - $oh); 666 $_->size_allocate ($w, $h - $oh);
579 $y += $h - $oh; 667 $y += $h - $oh;
… …
583 $y += $h; 671 $y += $h;
584 } 672 }
585 } 673 }
586} 674}
587 675
588sub _draw { 676#############################################################################
589 my ($self) = @_;
590 677
591 my ($x, $y);
592 for (@{$self->{childs} || []}) {
593 $_->draw;
594 $y += $_->h;
595 }
596}
597
598package Crossfire::Client::Widget::Label; 678package CFClient::Widget::Label;
599 679
600our @ISA = Crossfire::Client::Widget::; 680our @ISA = CFClient::Widget::;
601 681
602use SDL::OpenGL; 682use SDL::OpenGL;
603 683
604sub new { 684sub new {
605 my ($class, $x, $y, $z, $height, $text) = @_; 685 my ($class, %arg) = @_;
606 686
607 # TODO: color, and make height, xyz etc. optional 687 # TODO: color, and make height, xyz etc. optional
608 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height); 688 my $self = $class->SUPER::new (
689 color => [1, 1, 1],
690 height => $::FONTSIZE,
691 text => "",
692 layout => new CFClient::Layout,
693 %arg
694 );
609 695
610 $self->set_text ($text); 696 $self->set_text ($self->{text});
611 697
612 $self 698 $self
613} 699}
614 700
615sub set_text { 701sub set_text {
616 my ($self, $text) = @_; 702 my ($self, $text) = @_;
617 703
618 $self->{text} = $text; 704 $self->{text} = $text;
619 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height}; 705 $self->{layout}->set_markup ($text);
620 706
621 $self->update; 707 delete $self->{texture};
622} 708}
623 709
624sub get_text { 710sub get_text {
625 my ($self, $text) = @_; 711 my ($self, $text) = @_;
626 712
… …
628} 714}
629 715
630sub size_request { 716sub size_request {
631 my ($self) = @_; 717 my ($self) = @_;
632 718
633 ( 719 $self->{layout}->set_width;
720 $self->{layout}->set_height ($self->{height});
721 $self->{layout}->size
722# if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack
723# (
634 $self->{texture}{width}, 724# $self->{texture}{width},
635 $self->{texture}{height}, 725# $self->{texture}{height},
636 ) 726# )
727# } else {
728# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{height};
729#
730# ($w, $h)
731# }
732}
733
734sub size_allocate {
735 my ($self, $w, $h) = @_;
736
737 $self->SUPER::size_allocate ($w, $h);
738 delete $self->{texture};
637} 739}
638 740
639sub _draw { 741sub _draw {
640 my ($self) = @_; 742 my ($self) = @_;
641 743
642 my $tex = $self->{texture}; 744 my $tex = $self->{texture} ||= do {
745 $self->{layout}->set_width ($self->{w});
746 new_from_layout CFClient::Texture $self->{layout};
747 };
643 748
644 glEnable GL_BLEND; 749 glEnable GL_BLEND;
645 glEnable GL_TEXTURE_2D; 750 glEnable GL_TEXTURE_2D;
646 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 751 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
647 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 752 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
648 glBindTexture GL_TEXTURE_2D, $tex->{name};
649 753
650 glColor 1, 0, 0, 1; # TODO color 754 glColor @{$self->{color}};
651 755
652 glBegin GL_QUADS; 756 $tex->draw_quad (0, 0);
653 glTexCoord 0, 0; glVertex 0 , 0;
654 glTexCoord 0, 1; glVertex 0 , $tex->{height};
655 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
656 glTexCoord 1, 0; glVertex $tex->{width}, 0;
657 glEnd;
658 757
659 glDisable GL_BLEND; 758 glDisable GL_BLEND;
660 glDisable GL_TEXTURE_2D; 759 glDisable GL_TEXTURE_2D;
661} 760}
662 761
762#############################################################################
763
663package Crossfire::Client::Widget::TextEntry; 764package CFClient::Widget::Entry;
664 765
665our @ISA = Crossfire::Client::Widget::Label::; 766our @ISA = CFClient::Widget::Label::;
666 767
667use SDL; 768use SDL;
668use SDL::OpenGL; 769use SDL::OpenGL;
669 770
670sub key_down { 771sub key_down {
671 my ($self, $ev) = @_; 772 my ($self, $ev) = @_;
672 773
673 my $mod = $ev->key_mod; 774 my $mod = $ev->key_mod;
674 my $sym = $ev->key_sym; 775 my $sym = $ev->key_sym;
675 776
676 $ev->set_unicode (1);
677 my $uni = $ev->key_unicode; 777 my $uni = $ev->key_unicode;
678 778
679 my $text = $self->get_text; 779 my $text = $self->get_text;
680 780
681 if ($sym == SDLK_BACKSPACE) { 781 if ($sym == SDLK_BACKSPACE) {
682 substr $text, -1, 1, ''; 782 substr $text, -1, 1, '';
683
684 } elsif ($uni) { 783 } elsif ($uni) {
685 $text .= chr $uni; 784 $text .= chr $uni;
686 } 785 }
786
687 $self->set_text ($text); 787 $self->set_text ($text);
688} 788}
689 789
790sub button_down {
791 my ($self, $ev) = @_;
792
793 $self->focus_in;
794}
795
796sub mouse_motion {
797 my ($self, $ev, $x, $y) = @_;
798 printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
799}
800
801sub _draw {
802 my ($self) = @_;
803
804 if ($FOCUS == $self) {
805 glColor 1, 1, 1;
806 } else {
807 glColor 0.7, 0.7, 0.7;
808 }
809
810 glBegin GL_QUADS;
811 glVertex 0 , 0;
812 glVertex 0 , $self->{h} - 1;
813 glVertex $self->{w} - 1, $self->{h} - 1;
814 glVertex $self->{w} - 1, 0;
815 glEnd;
816
817 $self->SUPER::_draw;
818}
819
820#############################################################################
821
690package Crossfire::Client::Widget::MapWidget; 822package CFClient::Widget::MapWidget;
691 823
692use strict; 824use strict;
693 825
694use List::Util qw(min max); 826use List::Util qw(min max);
695 827
696use SDL; 828use SDL;
697use SDL::OpenGL; 829use SDL::OpenGL;
698use SDL::OpenGL::Constants; 830use SDL::OpenGL::Constants;
699 831
700our @ISA = Crossfire::Client::Widget::; 832our @ISA = CFClient::Widget::;
833
834sub new {
835 my $class = shift;
836
837 $class->SUPER::new (
838 z => -1,
839 list => (glGenLists 1),
840 @_
841 )
842}
701 843
702sub key_down { 844sub key_down {
703 print "MAPKEYDOWN\n"; 845 print "MAPKEYDOWN\n";
704} 846}
705 847
706sub key_up { 848sub key_up {
707} 849}
708 850
709sub size_request { 851sub size_request {
710 852 (
853 1 + int $::WIDTH / 32,
854 1 + int $::HEIGHT / 32,
855 )
711} 856}
712 857
713sub size_allocate { 858sub update {
859 my ($self) = @_;
860
861 $self->{need_update} = 1;
714} 862}
715 863
716sub _draw { 864sub _draw {
717 my ($self) = @_; 865 my ($self) = @_;
718 866
867 if (delete $self->{need_update}) {
868 glNewList $self->{list}, GL_COMPILE;
869
719 my $mx = $::CONN->{mapx}; 870 my $mx = $::CONN->{mapx};
720 my $my = $::CONN->{mapy}; 871 my $my = $::CONN->{mapy};
721 872
722 my $map = $::CONN->{map}; 873 my $map = $::CONN->{map};
723 874
724 my ($xofs, $yofs); 875 my ($xofs, $yofs);
725 876
726 my $sw = 1 + int $::WIDTH / 32; 877 my $sw = 1 + int $::WIDTH / 32;
727 my $sh = 1 + int $::HEIGHT / 32; 878 my $sh = 1 + int $::HEIGHT / 32;
728 879
729 if ($::CONN->{mapw} > $sw) { 880 if ($::CONN->{mapw} > $sw) {
730 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 881 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;
731 } else { 882 } else {
732 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs}; 883 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
733 } 884 }
734 885
735 if ($::CONN->{maph} > $sh) { 886 if ($::CONN->{maph} > $sh) {
736 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5; 887 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
737 } else { 888 } else {
738 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 889 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
739 } 890 }
740 891
741 glEnable GL_TEXTURE_2D; 892 glEnable GL_TEXTURE_2D;
742 glEnable GL_BLEND; 893 glEnable GL_BLEND;
743 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 894 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
744 895
745 my $sw4 = ($sw + 3) & ~3; 896 my $sw4 = ($sw + 3) & ~3;
746 my $lighting = "\x00" x ($sw4 * $sh); 897 my $darkness = "\x00" x ($sw4 * $sh);
747 898
748 for my $x (0 .. $sw - 1) { 899 for my $x (0 .. $sw - 1) {
900 my $row = $map->[$x + $xofs];
749 for my $y (0 .. $sh - 1) { 901 for my $y (0 .. $sh - 1) {
750 902
751 my $cell = $map->[$x + $xofs][$y + $yofs] 903 my $cell = $row->[$y + $yofs]
752 or next; 904 or next;
753 905
754 my $darkness = $cell->[0] * (1 / 255); 906 my $dark = $cell->[0];
755 if ($darkness < 0) { 907 if ($dark < 0) {
756 $darkness = 0.15; 908 substr $darkness, $y * $sw4 + $x, 1, chr 224;
909 } else {
910 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
757 } 911 }
758 substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
759 912
760 for my $num (grep $_, @$cell[1,2,3]) { 913 for my $num (grep $_, @$cell[1,2,3]) {
761 my $tex = $::CONN->{face}[$num]{texture} || next; 914 my $tex = $::CONN->{face}[$num]{texture} || next;
762 915
763 glBindTexture GL_TEXTURE_2D, $tex->{name};
764
765 my $w = $tex->{width}; 916 my $w = $tex->{width};
766 my $h = $tex->{height}; 917 my $h = $tex->{height};
767 918
768 my $px = ($x + 1) * 32 - $w; 919 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
769 my $py = ($y + 1) * 32 - $h;
770
771 glBegin GL_QUADS;
772 glTexCoord 0, 0; glVertex $px , $py;
773 glTexCoord 0, 1; glVertex $px , $py + $h;
774 glTexCoord 1, 1; glVertex $px + $w, $py + $h;
775 glTexCoord 1, 0; glVertex $px + $w, $py;
776 glEnd; 920 }
777 } 921 }
778 } 922 }
779 }
780 923
781# if (1) { # higher quality darkness 924# if (1) { # higher quality darkness
782# $lighting =~ s/(.)/$1$1$1/gs; 925# $lighting =~ s/(.)/$1$1$1/gs;
783# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3; 926# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
784# 927#
… …
786# 929#
787# $lighting = $pb->get_pixels; 930# $lighting = $pb->get_pixels;
788# $lighting =~ s/(.)../$1/gs; 931# $lighting =~ s/(.)../$1/gs;
789# } 932# }
790 933
791 $lighting = new Crossfire::Client::Texture
792 width => $sw4,
793 height => $sh,
794 data => $lighting,
795 internalformat => GL_ALPHA4,
796 format => GL_ALPHA;
797
798 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 934 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
799 glColor 0, 0, 0, 0.75;
800 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 935 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
801 glBindTexture GL_TEXTURE_2D, $lighting->{name};
802 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
803 glBegin GL_QUADS;
804 glTexCoord 0, 0; glVertex 0 , 0;
805 glTexCoord 0, 1; glVertex 0 , $sh * 32;
806 glTexCoord 1, 1; glVertex $sw4 * 32, $sh * 32;
807 glTexCoord 1, 0; glVertex $sw4 * 32, 0;
808 glEnd;
809 936
937 $darkness = new CFClient::Texture
938 width => $sw4,
939 height => $sh,
940 data => $darkness,
941 internalformat => GL_ALPHA,
942 format => GL_ALPHA;
943
944 glColor 0.45, 0.45, 0.45, 1;
945 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
946
810 glDisable GL_TEXTURE_2D; 947 glDisable GL_TEXTURE_2D;
811 glDisable GL_BLEND; 948 glDisable GL_BLEND;
949
950 glEndList;
951 }
952
953 glCallList $self->{list};
812} 954}
813 955
814my %DIR = ( 956my %DIR = (
815 SDLK_KP8, [1, "north"], 957 SDLK_KP8, [1, "north"],
816 SDLK_KP9, [2, "northeast"], 958 SDLK_KP9, [2, "northeast"],
… …
860 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 1002 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
861 $::CONN->send ("command run_stop"); 1003 $::CONN->send ("command run_stop");
862 } 1004 }
863} 1005}
864 1006
1007#############################################################################
1008
865package Crossfire::Client::Widget::Animator; 1009package CFClient::Widget::Animator;
866 1010
867use SDL::OpenGL; 1011use SDL::OpenGL;
868 1012
869our @ISA = Crossfire::Client::Widget::Bin::; 1013our @ISA = CFClient::Widget::Bin::;
870 1014
871sub moveto { 1015sub moveto {
872 my ($self, $x, $y) = @_; 1016 my ($self, $x, $y) = @_;
873 1017
874 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 1018 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
875 $self->{speed} = 0.01; 1019 $self->{speed} = 0.001;
876 $self->{time} = 1; 1020 $self->{time} = 1;
877 1021
878 ::animation_start $self; 1022 ::animation_start $self;
879} 1023}
880 1024
… …
895 1039
896sub _draw { 1040sub _draw {
897 my ($self) = @_; 1041 my ($self) = @_;
898 1042
899 glPushMatrix; 1043 glPushMatrix;
900 glRotate $self->{time} * 10000, 0, 1, 0; 1044 glRotate $self->{time} * 1000, 0, 1, 0;
901 $self->{child}->draw; 1045 $self->{children}[0]->draw;
902 glPopMatrix; 1046 glPopMatrix;
903} 1047}
904 1048
9051; 1049#############################################################################
906 1050
1051package CFClient::Widget::Toplevel;
1052
1053our @ISA = CFClient::Widget::Container::;
1054
1055sub size_request {
1056 ($::WIDTH, $::HEIGHT)
1057}
1058
1059sub size_allocate {
1060 my ($self, $w, $h) = @_;
1061
1062 $self->SUPER::size_allocate ($w, $h);
1063
1064 $_->size_allocate ($_->size_request)
1065 for @{$self->{children}};
1066}
1067
1068sub translate {
1069 my ($self, $x, $y) = @_;
1070
1071 ($x, $y)
1072}
1073
1074sub update {
1075 my ($self) = @_;
1076
1077 $self->size_allocate ($self->size_request);
1078 ::refresh ();
1079}
1080
1081sub add {
1082 my ($self, $widget) = @_;
1083
1084 $self->SUPER::add ($widget);
1085
1086 $widget->size_allocate ($widget->size_request);
1087}
1088
1089sub draw {
1090 my ($self) = @_;
1091
1092 $self->_draw;
1093}
1094
1095#############################################################################
1096
1097package CFClient::Widget;
1098
1099$TOPLEVEL = new CFClient::Widget::Toplevel;
1100
11011
1102

Diff Legend

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