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.35 by root, Sun Apr 9 17:34:15 2006 UTC vs.
Revision 1.38 by root, Sun Apr 9 21:34:49 2006 UTC

… …
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 10our $FOCUS; # the widget with current focus
11#our @ACTIVE_WIDGETS;
12 11
13# class methods for events 12# class methods for events
14sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS } 13sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS }
15sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS } 14sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS }
16sub feed_sdl_button_down_event { } 15sub feed_sdl_button_down_event { }
… …
20 my $class = shift; 19 my $class = shift;
21 20
22 bless { @_ }, $class 21 bless { @_ }, $class
23} 22}
24 23
25#sub activate {
26# push @ACTIVE_WIDGETS, $_[0];
27# Scalar::Util::weaken $ACTIVE_WIDGETS[-1];
28#}
29
30#sub deactivate {
31# @ACTIVE_WIDGETS =
32# sort { $a->{z} <=> $b->{z} }
33# grep { $_ && $_ != $_[0] }
34# @ACTIVE_WIDGETS;
35#}
36
37sub move { 24sub move {
38 my ($self, $x, $y, $z) = @_; 25 my ($self, $x, $y, $z) = @_;
39 $self->{x} = $x; 26 $self->{x} = $x;
40 $self->{y} = $y; 27 $self->{y} = $y;
41 $self->{z} = $z if defined $z; 28 $self->{z} = $z if defined $z;
… …
44sub needs_redraw { 31sub needs_redraw {
45 0 32 0
46} 33}
47 34
48sub size_request { 35sub size_request {
36 require Carp;
49 die "size_request is abtract"; 37 Carp::confess "size_request is abtract";
38}
39
40sub size_allocate {
41 my ($self, $w, $h) = @_;
42 $self->w ($w);
43 $self->h ($h);
50} 44}
51 45
52sub focus_in { 46sub focus_in {
53 my ($widget) = @_; 47 my ($widget) = @_;
54 $FOCUS = $widget; 48 $FOCUS = $widget;
… …
72 66
73sub button_up { 67sub button_up {
74 my ($widget, $sdlev) = @_; 68 my ($widget, $sdlev) = @_;
75} 69}
76 70
77sub w { $_[0]->{w} } 71sub w { $_[0]->{w} = $_[1] if $_[1]; $_[0]->{w} }
78sub h { $_[0]->{h} } 72sub h { $_[0]->{h} = $_[1] if $_[1]; $_[0]->{h} }
79sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} } 73sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} }
80sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} } 74sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} }
81sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} } 75sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} }
82 76
83sub draw { 77sub draw {
… …
88 $self->_draw; 82 $self->_draw;
89 glPopMatrix; 83 glPopMatrix;
90} 84}
91 85
92sub _draw { 86sub _draw {
93 my ($widget) = @_; 87 my ($self) = @_;
88
89 warn "no draw defined for $self\n";
94} 90}
95 91
96sub bbox { 92sub bbox {
97 my ($self) = @_; 93 my ($self) = @_;
98 my ($w, $h) = $self->size_request; 94 my ($w, $h) = $self->size_request;
… …
102 $self->{x} = $w, 98 $self->{x} = $w,
103 $self->{y} = $h 99 $self->{y} = $h
104 ) 100 )
105} 101}
106 102
103sub find_widget {
104 my ($self, $x, $y) = @_;
105
106 return $self
107 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
108 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
109
110 ()
111}
112
107sub del_parent { $_[0]->{parent} = undef } 113sub del_parent { $_[0]->{parent} = undef }
108 114
109sub set_parent { 115sub set_parent {
110 my ($self, $par) = @_; 116 my ($self, $par) = @_;
111 117
… …
128 my ($self) = @_; 134 my ($self) = @_;
129 135
130 #$self->deactivate; 136 #$self->deactivate;
131} 137}
132 138
139package Crossfire::Client::Widget::Container;
140
141our @ISA = Crossfire::Client::Widget::;
142
143sub new {
144 my ($class, @widgets) = @_;
145
146 my $self = $class->SUPER::new (children => []);
147 $self->add ($_) for @widgets;
148
149 $self
150}
151
152sub add {
153 my ($self, $chld, $expand) = @_;
154
155 $chld->{expand} = $expand;
156 $chld->set_parent ($self);
157
158 @{$self->{children}} =
159 sort { $a->{z} <=> $b->{z} }
160 @{$self->{children}}, $chld;
161
162 $self->size_allocate ($self->{w}, $self->{h});
163}
164
165sub remove {
166 my ($self, $widget) = @_;
167
168 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
169
170 $self->size_allocate ($self->{w}, $self->{h});
171}
172
173sub find_widget {
174 my ($self, $x, $y) = @_;
175
176 my $res;
177
178 for (@{ $self->{children} }) {
179 $res = $_->find_widget ($x, $y)
180 and return $res;
181 }
182
183 ()
184}
185
186sub size_request {
187 my ($self) = @_;
188
189 my ($hs, $ws) = (0, 0);
190 for (@{$self->{children} || []}) {
191 my ($w, $h) = $_->size_request;
192 $hs += $h;
193 if ($ws < $w) { $ws = $w }
194 }
195
196 return ($ws, $hs);
197}
198
199sub _draw {
200 my ($self) = @_;
201
202 $_->draw for @{$self->{children}};
203}
204
133package Crossfire::Client::Widget::Bin; 205package Crossfire::Client::Widget::Bin;
134 206
135our @ISA = Crossfire::Client::Widget::; 207our @ISA = Crossfire::Client::Widget::Container::;
136 208
137sub add { $_[0]->{child} = $_[1]; $_[1]->set_parent ($_[0]); $_[1]->update }
138
139sub get { $_[0]->{child} } 209sub get { $_[0]->{children}[0] }
140
141sub remove {
142 my ($self, $chld) = @_;
143 delete $self->{child}
144 if $self->{child} == $chld;
145}
146 210
147sub size_request { 211sub size_request {
148 $_[0]->{child}->size_request if $_[0]->{child} 212 $_[0]{children}[0]->size_request if $_[0]{children}[0];
149} 213}
150 214
151sub _draw { 215sub size_allocate {
152 my ($self) = @_; 216 my ($self, $w, $h) = @_;
153 217 $self->SUPER::size_allocate ($w, $h);
154 $self->{child}->draw; 218 $self->{children}[0]->size_allocate ($w, $h)
219 if $self->{children}[0]
155} 220}
156 221
157package Crossfire::Client::Widget::Toplevel; 222package Crossfire::Client::Widget::Toplevel;
158 223
224our @ISA = Crossfire::Client::Widget::Container::;
225
226sub update {
227 my ($self) = @_;
228
229 ::refresh ();
230}
231
232package Crossfire::Client::Widget::Window;
233
159our @ISA = Crossfire::Client::Widget::; 234our @ISA = Crossfire::Client::Widget::Bin::;
160 235
161use SDL::OpenGL; 236use SDL::OpenGL;
162 237
163sub add { 238sub add {
164 my ($self, $chld) = @_; 239 my ($self, $chld) = @_;
165 240 warn "ADD $chld\n";
166 push @{$self->{childs}}, $chld;
167 @{$self->{childs}} =
168 sort { $a->{z} <=> $b->{z} }
169 @{$self->{childs}};
170
171 $chld->set_parent ($self);
172}
173
174sub remove {
175 my ($self, $chld) = @_;
176 @{$self->{childs}} =
177 sort { $a->{z} <=> $b->{z} }
178 grep { $_ && $_ != $_[0] }
179 @{$self->{childs}}
180}
181
182sub update {
183 my ($self) = @_;
184 ::refresh ();
185}
186
187sub _draw {
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 $self->SUPER::add ($chld); 241 $self->SUPER::add ($chld);
202 $chld->set_parent ($self); 242 $chld->set_parent ($self);
203 $self->update; #TODO: Move this to the size_request event propably?
204} 243}
205 244
206sub remove { 245sub remove {
207 my ($self) = @_; 246 my ($self) = @_;
208 # TODO FIXME: removing a child from a window will crash, see render_chld 247 # TODO FIXME: removing a child from a window will crash, see render_chld
209 $self->update; 248 # $self->update;
210} 249}
211 250
212sub update { 251sub update {
213 my ($self) = @_; 252 my ($self) = @_;
214 $self->render_chld; 253 $self->render_chld;
… …
217sub render_chld { 256sub render_chld {
218 my ($self) = @_; 257 my ($self) = @_;
219 my $chld = $self->get; 258 my $chld = $self->get;
220 my ($w, $h) = $self->size_request; 259 my ($w, $h) = $self->size_request;
221 260
261 require Carp;
262 Carp::cluck "RENDERCHI $w $h";
263 warn "RENDERCHI $w $h\n";
222 $self->{texture} = 264 $self->{texture} =
223 Crossfire::Client::Texture->new_from_opengl ( 265 Crossfire::Client::Texture->new_from_opengl (
224 $w, $h, sub { $chld->draw } 266 $w, $h, sub { $chld->draw }
225 ); 267 );
226 $self->{texture}->upload; 268 $self->{texture}->upload;
227} 269}
228 270
229sub size_request { 271sub size_request {
230 my ($self) = @_; 272 my ($self) = @_;
231 my $chld = $self->get 273 ($self->w, $self->h)
232 or return (0, 0); 274}
233 $chld->size_request 275
276sub size_allocate {
277 my ($self, $w, $h) = @_;
278
279 $self->w ($w);
280 $self->h ($h);
281 $self->get->size_allocate ($w, $h);
282
283 $self->update; #TODO: Move this to the size_request event propably?
234} 284}
235 285
236sub _draw { 286sub _draw {
237 my ($self) = @_; 287 my ($self) = @_;
238 288
239 my ($w, $h) = $self->size_request;#TODO# use width/height of texture 289 my ($w, $h) = ($self->w, $self->h);
240 290
241 my $tex = $self->{texture} 291 my $tex = $self->{texture}
242 or return; 292 or return;
243 293
244 glEnable GL_BLEND; 294 glEnable GL_BLEND;
… …
269 or return (0, 0); 319 or return (0, 0);
270 320
271 $chld->move (2, 2); 321 $chld->move (2, 2);
272 322
273 map { $_ + 4 } $chld->size_request; 323 map { $_ + 4 } $chld->size_request;
324}
325
326sub size_allocate {
327 my ($self, $w, $h) = @_;
328
329 $self->w ($w);
330 $self->h ($h);
331
332 $self->get->size_allocate ($w - 4, $h - 4);
333 $self->get->move (2, 2);
274} 334}
275 335
276sub _draw { 336sub _draw {
277 my ($self) = @_; 337 my ($self) = @_;
278 338
… …
304 $self->{txts} = [ 364 $self->{txts} = [
305 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ } 365 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ }
306 qw/d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png/ 366 qw/d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png/
307 ]; 367 ];
308 $self 368 $self
309
310} 369}
311 370
312sub size_request { 371sub size_request {
313 my ($self) = @_; 372 my ($self) = @_;
314 my ($w, $h) = $self->get->size_request; 373 my ($w, $h) = $self->get->size_request;
… …
316 $h += $self->{txts}->[1]->{height}; 375 $h += $self->{txts}->[1]->{height};
317 $h += $self->{txts}->[4]->{height}; 376 $h += $self->{txts}->[4]->{height};
318 $w += $self->{txts}->[2]->{width}; 377 $w += $self->{txts}->[2]->{width};
319 $w += $self->{txts}->[3]->{width}; 378 $w += $self->{txts}->[3]->{width};
320 379
380 ($w, $h)
381}
382
383sub size_allocate {
384 my ($self, $w, $h) = @_;
385
386 $self->w ($w);
387 $self->h ($h);
388 $h -= $self->{txts}->[1]->{height};
389 $h -= $self->{txts}->[4]->{height};
390 $w -= $self->{txts}->[2]->{width};
391 $w -= $self->{txts}->[3]->{width};
392
393 $h = $h < 0 ? 0 : $h;
394 $w = $w < 0 ? 0 : $w;
395 warn "CHILD:$w $h\n";
396 $self->get->size_allocate ($w, $h);
321 $self->get->move ($self->{txts}->[3]->{width}, $self->{txts}->[1]->{height}); 397 $self->get->move ($self->{txts}->[3]->{width}, $self->{txts}->[1]->{height});
322
323 ($w, $h)
324} 398}
325 399
326sub _draw { 400sub _draw {
327 my ($self) = @_; 401 my ($self) = @_;
328 402
329 my ($w, $h) = $self->size_request; 403 my ($w, $h) = ($self->w, $self->h);
330 my ($cw, $ch) = $self->get->size_request; 404 my ($cw, $ch) = ($self->get->w, $self->get->h);
331 405
332 glEnable GL_BLEND; 406 glEnable GL_BLEND;
333 glEnable GL_TEXTURE_2D; 407 glEnable GL_TEXTURE_2D;
334 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 408 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
335 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 409 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
336
337 410
338 my $top = $self->{txts}->[1]; 411 my $top = $self->{txts}->[1];
339 glBindTexture GL_TEXTURE_2D, $top->{name}; 412 glBindTexture GL_TEXTURE_2D, $top->{name};
340 413
341 glColor 1, 1, 1, 0.8;
342
343 glBegin GL_QUADS; 414 glBegin GL_QUADS;
344 glTexCoord 0, 0; glVertex 0 , 0; 415 glTexCoord 0, 0; glVertex 0 , 0;
345 glTexCoord 0, 1; glVertex 0 , $top->{height}; 416 glTexCoord 0, 1; glVertex 0 , $top->{height};
346 glTexCoord 1, 1; glVertex $w , $top->{height}; 417 glTexCoord 1, 1; glVertex $w , $top->{height};
347 glTexCoord 1, 0; glVertex $w , 0; 418 glTexCoord 1, 0; glVertex $w , 0;
348 glEnd; 419 glEnd;
349 420
350 my $left = $self->{txts}->[3]; 421 my $left = $self->{txts}->[3];
351 glBindTexture GL_TEXTURE_2D, $left->{name}; 422 glBindTexture GL_TEXTURE_2D, $left->{name};
352 423
353 glColor 1, 1, 1, 0.8;
354
355 glBegin GL_QUADS; 424 glBegin GL_QUADS;
356 glTexCoord 0, 0; glVertex 0 , $top->{height}; 425 glTexCoord 0, 0; glVertex 0 , $top->{height};
357 glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch; 426 glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch;
358 glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch; 427 glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
359 glTexCoord 1, 0; glVertex $left->{width}, $top->{height}; 428 glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
360 glEnd; 429 glEnd;
361 430
362 my $right = $self->{txts}->[2]; 431 my $right = $self->{txts}->[2];
363 glBindTexture GL_TEXTURE_2D, $right->{name}; 432 glBindTexture GL_TEXTURE_2D, $right->{name};
364 433
365 glColor 1, 1, 1, 0.8;
366
367 glBegin GL_QUADS; 434 glBegin GL_QUADS;
368 glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height}; 435 glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
369 glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch; 436 glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
370 glTexCoord 1, 1; glVertex $w , $top->{height} + $ch; 437 glTexCoord 1, 1; glVertex $w , $top->{height} + $ch;
371 glTexCoord 1, 0; glVertex $w , $top->{height}; 438 glTexCoord 1, 0; glVertex $w , $top->{height};
372 glEnd; 439 glEnd;
373 440
374 my $bottom = $self->{txts}->[4]; 441 my $bottom = $self->{txts}->[4];
375 glBindTexture GL_TEXTURE_2D, $bottom->{name}; 442 glBindTexture GL_TEXTURE_2D, $bottom->{name};
376 443
377 glColor 1, 1, 1, 0.8;
378
379 glBegin GL_QUADS; 444 glBegin GL_QUADS;
380 glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height}; 445 glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height};
381 glTexCoord 0, 1; glVertex 0 , $h; 446 glTexCoord 0, 1; glVertex 0 , $h;
382 glTexCoord 1, 1; glVertex $w , $h; 447 glTexCoord 1, 1; glVertex $w , $h;
383 glTexCoord 1, 0; glVertex $w , $h - $bottom->{height}; 448 glTexCoord 1, 0; glVertex $w , $h - $bottom->{height};
384 glEnd; 449 glEnd;
385 450
386 my $bg = $self->{txts}->[0]; 451 my $bg = $self->{txts}->[0];
387 glBindTexture GL_TEXTURE_2D, $bg->{name}; 452 glBindTexture GL_TEXTURE_2D, $bg->{name};
453 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
388 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT; 454 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
389 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT; 455 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
390 456
391 glColor 1, 1, 1, 0.8;
392
393 my $rep_x = $cw / $bg->{width}; 457 my $rep_x = $cw / $bg->{width};
394 my $rep_y = $ch / $bg->{height}; 458 my $rep_y = $ch / $bg->{height};
395 459
396 glBegin GL_QUADS; 460 glBegin GL_QUADS;
397 glTexCoord 0, 0; glVertex $left->{width}, $top->{height}; 461 glTexCoord 0, 0; glVertex $left->{width}, $top->{height};
398 glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch; 462 glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch;
399 glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch; 463 glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch;
400 glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height}; 464 glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height};
401 glEnd; 465 glEnd;
402
403 $self->get->draw;
404 466
405 glDisable GL_BLEND; 467 glDisable GL_BLEND;
406 glDisable GL_TEXTURE_2D; 468 glDisable GL_TEXTURE_2D;
469
470 $self->get->draw;
471
407} 472}
408 473
409package Crossfire::Client::Widget::Table; 474package Crossfire::Client::Widget::Table;
410 475
411our @ISA = Crossfire::Client::Widget::Bin::; 476our @ISA = Crossfire::Client::Widget::Bin::;
412 477
413use SDL::OpenGL; 478use SDL::OpenGL;
414 479
415sub add { 480sub add {
416 my ($self, $x, $y, $chld) = @_; 481 my ($self, $x, $y, $chld) = @_;
417 my $old_chld = $self->{childs}[$y][$x]; 482 my $old_chld = $self->{children}[$y][$x];
418 483
419 $self->{childs}[$y][$x] = $chld; 484 $self->{children}[$y][$x] = $chld;
420 $chld->set_parent ($self); 485 $chld->set_parent ($self);
421 $self->update; 486 $self->update;
422} 487}
423 488
424sub max_row_height { 489sub max_row_height {
425 my ($self, $row) = @_; 490 my ($self, $row) = @_;
426 491
427 my $hs = 0; 492 my $hs = 0;
428 for (my $xi = 0; $xi <= $#{$self->{childs}->[$row] || []}; $xi++) { 493 for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) {
429 my $c = $self->{childs}->[$row]->[$xi]; 494 my $c = $self->{children}->[$row]->[$xi];
430 if ($c) { 495 if ($c) {
431 my ($w, $h) = $c->size_request; 496 my ($w, $h) = $c->size_request;
432 if ($hs < $h) { $hs = $h } 497 if ($hs < $h) { $hs = $h }
433 } 498 }
434 } 499 }
… …
437 502
438sub max_col_width { 503sub max_col_width {
439 my ($self, $col) = @_; 504 my ($self, $col) = @_;
440 505
441 my $ws = 0; 506 my $ws = 0;
442 for (my $yi = 0; $yi <= $#{$self->{childs} || []}; $yi++) { 507 for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) {
443 my $c = ($self->{childs}->[$yi] || [])->[$col]; 508 my $c = ($self->{children}->[$yi] || [])->[$col];
444 if ($c) { 509 if ($c) {
445 my ($w, $h) = $c->size_request; 510 my ($w, $h) = $c->size_request;
446 if ($ws < $w) { $ws = $w } 511 if ($ws < $w) { $ws = $w }
447 } 512 }
448 } 513 }
… …
452sub size_request { 517sub size_request {
453 my ($self) = @_; 518 my ($self) = @_;
454 519
455 my ($hs, $ws) = (0, 0); 520 my ($hs, $ws) = (0, 0);
456 521
457 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 522 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
458 $hs += $self->max_row_height ($yi); 523 $hs += $self->max_row_height ($yi);
459 } 524 }
460 525
461 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 526 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
462 my $wm = 0; 527 my $wm = 0;
463 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 528 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
464 $wm += $self->max_col_width ($xi) 529 $wm += $self->max_col_width ($xi)
465 } 530 }
466 if ($ws < $wm) { $ws = $wm } 531 if ($ws < $wm) { $ws = $wm }
467 } 532 }
468 533
… …
471 536
472sub _draw { 537sub _draw {
473 my ($self) = @_; 538 my ($self) = @_;
474 539
475 my $y = 0; 540 my $y = 0;
476 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 541 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
477 my $x = 0; 542 my $x = 0;
478 543
479 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 544 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
480 545
481 my $c = $self->{childs}->[$yi]->[$xi]; 546 my $c = $self->{children}->[$yi]->[$xi];
482 if ($c) { 547 if ($c) {
483 $c->move ($x, $y, 0); #TODO: Move to size_request 548 $c->move ($x, $y, 0); #TODO: Move to size_request
484 $c->draw if $c; 549 $c->draw if $c;
485 } 550 }
486 551
… …
491 } 556 }
492} 557}
493 558
494package Crossfire::Client::Widget::VBox; 559package Crossfire::Client::Widget::VBox;
495 560
496our @ISA = Crossfire::Client::Widget::Bin::; 561our @ISA = Crossfire::Client::Widget::Container::;
497 562
498use SDL::OpenGL; 563use SDL::OpenGL;
499 564
500sub add { 565sub size_allocate {
501 my ($self, $chld) = @_; 566 my ($self, $w, $h) = @_;
502 push @{$self->{childs}}, $chld;
503 $chld->set_parent ($self);
504 $self->update;
505}
506 567
507sub size_request { 568 $self->w ($w);
508 my ($self) = @_; 569 $self->h ($h);
509 570
510 my ($hs, $ws) = (0, 0); 571 my $exp;
572 my @oth;
573 # find expand widget
511 for (@{$self->{childs} || []}) { 574 for (@{$self->{children}}) {
575 if ($_->{expand}) {
576 $exp = $_;
577 last;
578 }
579 push @oth, $_;
580 }
581
582 my ($ow, $oh);
583
584 # get sizes of other widgets
585 for (@oth) {
512 my ($w, $h) = $_->size_request; 586 my ($w, $h) = $_->size_request;
513 $hs += $h; 587 $oh += $h;
514 if ($ws < $w) { $ws = $w } 588 if ($ow < $w) { $ow = $w }
515 } 589 }
516 590
517 return ($ws, $hs); 591 my $y = 0;
592 for (@{$self->{children}}) {
593 $_->move (0, $y);
594
595 if ($_ == $exp) {
596 $_->size_allocate ($w, $h - $oh);
597 $y += $h - $oh;
598 } else {
599 my ($cw, $h) = $_->size_request;
600 $_->size_allocate ($w, $h);
601 $y += $h;
602 }
603 }
518} 604}
519 605
520sub _draw { 606sub _draw {
521 my ($self) = @_; 607 my ($self) = @_;
522 608
523 my ($x, $y); 609 my ($x, $y);
524 for (@{$self->{childs} || []}) { 610 for (@{$self->{children} || []}) {
525 $_->move (0, $y, 0); #TODO: move to size_request
526 $_->draw; 611 $_->draw;
527 my ($w, $h) = $_->size_request;
528 $y += $h; 612 $y += $_->h;
529 } 613 }
530} 614}
531 615
532package Crossfire::Client::Widget::Label; 616package Crossfire::Client::Widget::Label;
533 617
… …
579 glEnable GL_TEXTURE_2D; 663 glEnable GL_TEXTURE_2D;
580 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 664 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
581 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 665 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
582 glBindTexture GL_TEXTURE_2D, $tex->{name}; 666 glBindTexture GL_TEXTURE_2D, $tex->{name};
583 667
584 glColor 1, 1, 1, 0.6; # TODO color 668 glColor 1, 0, 0, 1; # TODO color
585 669
586 glBegin GL_QUADS; 670 glBegin GL_QUADS;
587 glTexCoord 0, 0; glVertex 0 , 0; 671 glTexCoord 0, 0; glVertex 0 , 0;
588 glTexCoord 0, 1; glVertex 0 , $tex->{height}; 672 glTexCoord 0, 1; glVertex 0 , $tex->{height};
589 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height}; 673 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
… …
619 $text .= chr $uni; 703 $text .= chr $uni;
620 } 704 }
621 $self->set_text ($text); 705 $self->set_text ($text);
622} 706}
623 707
624
625# XXX: TextView isn't neccessary with pango multiline text rendering
626package Crossfire::Client::Widget::TextView;
627
628use strict;
629
630our @ISA = qw/Crossfire::Client::Widget/;
631
632use SDL::OpenGL;
633use SDL::OpenGL::Constants;
634
635sub new {
636 my ($class, $text, $h) = @_;
637 my $self = $class->SUPER::new ();
638
639 $self->{txt_height} = $h;
640 @{$self->{lines}} = split /\r?\n/, $text;
641
642 for (split /\r?\n/, $text) {
643 $self->add_line ($_);
644 }
645 $self
646}
647
648#sub render_lines {
649# my ($self) = @_;
650#
651# $self->{txt_lines} = [];
652#
653# for (@{$self->{lines}}) {
654# push @{$self->{txt_lines}},
655# new_from_ttf Crossfire::Client::Texture $self->{ttf}, $_;
656# }
657#}
658
659sub add_line {
660 my ($self, $line) = @_;
661 push @{$self->{lines}}, $line;
662
663 push @{$self->{txt_lines}},
664 new_from_text Crossfire::Client::Texture $line, $self->{txt_height};
665}
666
667sub size_request {
668 my ($self) = @_;
669
670 my $w = 0;
671 my $h = 0;
672
673 for (@{$self->{txt_lines}}) {
674 if ($w < $_->{width}) { $w = $_->{width} }
675 $h += $_->{height};
676 }
677
678 return ($w, $h);
679}
680
681sub draw_line {
682 my ($self, $tex, $y) = @_;
683
684 glBindTexture GL_TEXTURE_2D, $tex->{name};
685
686 glColor 1, 0, 1;
687
688 glBegin GL_QUADS;
689 glTexCoord 0, 0; glVertex 0 , $y;
690 glTexCoord 0, 1; glVertex 0 , $y + $tex->{height};
691 glTexCoord 1, 1; glVertex $tex->{width}, $y + $tex->{height};
692 glTexCoord 1, 0; glVertex $tex->{width}, $y;
693 glEnd;
694}
695
696sub _draw {
697 my ($self) = @_;
698
699 glEnable GL_BLEND;
700 glEnable GL_TEXTURE_2D;
701 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;#DECAL;
702
703 my $l = 0;
704 for (@{$self->{txt_lines}}) {
705 $self->draw_line ($_, $l);
706 $l += $_->{height};
707 }
708
709 glDisable GL_BLEND;
710 glDisable GL_TEXTURE_2D;
711}
712
713package Crossfire::Client::Widget::MapWidget; 708package Crossfire::Client::Widget::MapWidget;
714 709
715use strict; 710use strict;
716 711
717use List::Util qw(min max); 712use List::Util qw(min max);
… …
725sub key_down { 720sub key_down {
726 print "MAPKEYDOWN\n"; 721 print "MAPKEYDOWN\n";
727} 722}
728 723
729sub key_up { 724sub key_up {
725}
726
727sub size_request {
728
729}
730
731sub size_allocate {
730} 732}
731 733
732sub _draw { 734sub _draw {
733 my ($self) = @_; 735 my ($self) = @_;
734 736
… …
886 888
887sub moveto { 889sub moveto {
888 my ($self, $x, $y) = @_; 890 my ($self, $x, $y) = @_;
889 891
890 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 892 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
891 $self->{speed} = 0.01; 893 $self->{speed} = 0.2;
892 $self->{time} = 1; 894 $self->{time} = 1;
893 895
894 ::animation_start $self; 896 ::animation_start $self;
895} 897}
896 898
… …
912sub _draw { 914sub _draw {
913 my ($self) = @_; 915 my ($self) = @_;
914 916
915 glPushMatrix; 917 glPushMatrix;
916 glRotate $self->{time} * 10000, 0, 1, 0; 918 glRotate $self->{time} * 10000, 0, 1, 0;
917 $self->{child}->draw; 919 $self->{children}[0]->draw;
918 glPopMatrix; 920 glPopMatrix;
919} 921}
920 922
9211; 9231;
922 924

Diff Legend

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