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.43 by root, Sun Apr 9 22:12:11 2006 UTC

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

Diff Legend

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