Changeset 11112
- Timestamp:
- 11/09/11 18:48:29 (12 years ago)
- Location:
- titan/titan
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
titan/titan/header.h
r11011 r11112 204 204 205 205 //skin.h 206 char* savescreen(struct skin* node); 207 void restorescreen(char* buf, struct skin* node); 206 208 char* changepicpath(char* picname); 207 209 long convertcol(char *value); … … 262 264 //rcfunc.h 263 265 void inputboxchar(struct skin* screen, struct skin* inputbox, char zeichen, int flag); 264 void inputboxff(struct skin* screen, struct skin* inputbox );265 void inputboxfr(struct skin* screen, struct skin* inputbox );266 void inputboxright(struct skin* screen, struct skin* inputbox );267 void inputboxleft(struct skin* screen, struct skin* inputbox );266 void inputboxff(struct skin* screen, struct skin* inputbox, int flag); 267 void inputboxfr(struct skin* screen, struct skin* inputbox, int flag); 268 void inputboxright(struct skin* screen, struct skin* inputbox, int flag); 269 void inputboxleft(struct skin* screen, struct skin* inputbox, int flag); 268 270 int addscreenrc(struct skin* screen, struct skin* node); 269 271 void checkinputboxnumright(struct skin* inputbox); -
titan/titan/inputhelp.h
r10717 r11112 2 2 #define INPUTHELP_H 3 3 4 void inputhelpnum(struct skin* inputhelp, struct skin* inputbox, char num )4 void inputhelpnum(struct skin* inputhelp, struct skin* inputbox, char num, int flag) 5 5 { 6 inputboxff(inputhelp, inputbox );7 inputboxchar(inputhelp, inputbox, num, 0);8 drawscreen(inputhelp, 0);6 inputboxff(inputhelp, inputbox, flag); 7 inputboxchar(inputhelp, inputbox, num, flag); 8 drawscreen(inputhelp, flag); 9 9 } 10 10 11 char* screeninputhelp(char* text )11 char* screeninputhelp(char* text, int flag) 12 12 { 13 13 int rcret = 0, tmpscreencalc = 0; … … 29 29 tmpscreencalc = status.screencalc; 30 30 status.screencalc = 0; 31 drawscreen(inputhelp, 0);31 drawscreen(inputhelp, flag); 32 32 addscreenrc(inputhelp, grid); 33 33 … … 42 42 } 43 43 if(rcret == getrcconfigint("rcff", NULL)) 44 inputboxright(inputhelp, inputbox );44 inputboxright(inputhelp, inputbox, flag); 45 45 if(rcret == getrcconfigint("rcfr", NULL)) 46 inputboxleft(inputhelp, inputbox );46 inputboxleft(inputhelp, inputbox, flag); 47 47 if(rcret == getrcconfigint("rc0", NULL)) 48 inputhelpnum(inputhelp, inputbox, '0' );48 inputhelpnum(inputhelp, inputbox, '0', flag); 49 49 if(rcret == getrcconfigint("rc1", NULL)) 50 inputhelpnum(inputhelp, inputbox, '1' );50 inputhelpnum(inputhelp, inputbox, '1', flag); 51 51 if(rcret == getrcconfigint("rc2", NULL)) 52 inputhelpnum(inputhelp, inputbox, '2' );52 inputhelpnum(inputhelp, inputbox, '2', flag); 53 53 if(rcret == getrcconfigint("rc3", NULL)) 54 inputhelpnum(inputhelp, inputbox, '3' );54 inputhelpnum(inputhelp, inputbox, '3', flag); 55 55 if(rcret == getrcconfigint("rc4", NULL)) 56 inputhelpnum(inputhelp, inputbox, '4' );56 inputhelpnum(inputhelp, inputbox, '4', flag); 57 57 if(rcret == getrcconfigint("rc5", NULL)) 58 inputhelpnum(inputhelp, inputbox, '5' );58 inputhelpnum(inputhelp, inputbox, '5', flag); 59 59 if(rcret == getrcconfigint("rc6", NULL)) 60 inputhelpnum(inputhelp, inputbox, '6' );60 inputhelpnum(inputhelp, inputbox, '6', flag); 61 61 if(rcret == getrcconfigint("rc7", NULL)) 62 inputhelpnum(inputhelp, inputbox, '7' );62 inputhelpnum(inputhelp, inputbox, '7', flag); 63 63 if(rcret == getrcconfigint("rc8", NULL)) 64 inputhelpnum(inputhelp, inputbox, '8' );64 inputhelpnum(inputhelp, inputbox, '8', flag); 65 65 if(rcret == getrcconfigint("rc9", NULL)) 66 inputhelpnum(inputhelp, inputbox, '9' );66 inputhelpnum(inputhelp, inputbox, '9', flag); 67 67 68 68 if(rcret == getrcconfigint("rcok", NULL) || rcret == getrcconfigint("rcred", NULL) || rcret == getrcconfigint("rcgreen", NULL) || rcret == getrcconfigint("rcyellow", NULL) || rcret == getrcconfigint("rcblue", NULL)) … … 77 77 if(rcret == getrcconfigint("rcred", NULL) || (rcret == getrcconfigint("rcok", NULL) && ostrcmp(grid->select->name, "bs") == 0)) 78 78 { 79 inputboxfr(inputhelp, inputbox );79 inputboxfr(inputhelp, inputbox, flag); 80 80 continue; 81 81 } … … 83 83 { 84 84 changeinput(inputbox, NULL); 85 drawscreen(inputhelp, 0);85 drawscreen(inputhelp, flag); 86 86 continue; 87 87 } 88 88 if(rcret == getrcconfigint("rcok", NULL) && ostrcmp(grid->select->name, "left") == 0) 89 89 { 90 inputboxleft(inputhelp, inputbox );91 drawscreen(inputhelp, 0);90 inputboxleft(inputhelp, inputbox, flag); 91 drawscreen(inputhelp, flag); 92 92 continue; 93 93 } 94 94 if(rcret == getrcconfigint("rcok", NULL) && ostrcmp(grid->select->name, "right") == 0) 95 95 { 96 inputboxright(inputhelp, inputbox );97 drawscreen(inputhelp, 0);96 inputboxright(inputhelp, inputbox, flag); 97 drawscreen(inputhelp, flag); 98 98 continue; 99 99 } … … 116 116 addscreenrc(inputhelp, grid); 117 117 } 118 drawscreen(inputhelp, 0);118 drawscreen(inputhelp, flag); 119 119 continue; 120 120 } 121 121 if(rcret == getrcconfigint("rcyellow", NULL)) 122 122 { 123 inputboxff(inputhelp, inputbox );124 inputboxchar(inputhelp, inputbox, ' ', 0);125 drawscreen(inputhelp, 0);123 inputboxff(inputhelp, inputbox, flag); 124 inputboxchar(inputhelp, inputbox, ' ', flag); 125 drawscreen(inputhelp, flag); 126 126 continue; 127 127 } 128 128 129 inputboxff(inputhelp, inputbox );130 inputboxchar(inputhelp, inputbox, grid->select->name[0], 0);129 inputboxff(inputhelp, inputbox, flag); 130 inputboxchar(inputhelp, inputbox, grid->select->name[0], flag); 131 131 } 132 132 } … … 135 135 delownerrc(inputhelp); 136 136 clearscreen(inputhelp); 137 drawscreen(skin, 0);137 drawscreen(skin, flag); 138 138 status.screencalc = tmpscreencalc; 139 139 return tmpstr; -
titan/titan/rcfunc.h
r11004 r11112 2 2 #define RCFUNC_H 3 3 4 void progressbarright(struct skin* screen, struct skin* progressbar )4 void progressbarright(struct skin* screen, struct skin* progressbar, int flag) 5 5 { 6 6 debug(1000, "in"); … … 11 11 { 12 12 progressbar->progresssize++; 13 drawscreen(screen, 0);13 drawscreen(screen, flag); 14 14 } 15 15 else … … 20 20 } 21 21 22 void progressbarleft(struct skin* screen, struct skin* progressbar )22 void progressbarleft(struct skin* screen, struct skin* progressbar, int flag) 23 23 { 24 24 debug(1000, "in"); … … 29 29 { 30 30 progressbar->progresssize--; 31 drawscreen(screen, 0);31 drawscreen(screen, flag); 32 32 } 33 33 else … … 38 38 } 39 39 40 void filelistok(struct skin* screen, struct skin* filelist )40 void filelistok(struct skin* screen, struct skin* filelist, int flag) 41 41 { 42 42 debug(1000, "in"); … … 79 79 setlistboxselection(filelist, plastdir); 80 80 free(lastdir); lastdir = NULL; 81 drawscreen(screen, 0);81 drawscreen(screen, flag); 82 82 } 83 83 else … … 88 88 } 89 89 90 void inputboxhelp(struct skin* screen, struct skin* inputbox )90 void inputboxhelp(struct skin* screen, struct skin* inputbox, int flag) 91 91 { 92 92 char* tmpstr = NULL; 93 93 94 if(inputbox != NULL && inputbox->type == INPUTBOX )95 { 96 tmpstr = screeninputhelp(inputbox->input );94 if(inputbox != NULL && inputbox->type == INPUTBOX && flag == 0) 95 { 96 tmpstr = screeninputhelp(inputbox->input, flag); 97 97 changeinput(inputbox, tmpstr); 98 98 free(tmpstr); tmpstr = NULL; 99 drawscreen(screen, 0);99 drawscreen(screen, flag); 100 100 } 101 101 } … … 109 109 { 110 110 inputbox->input[inputbox->aktpage - 1] = zeichen; 111 if(flag == 0)112 drawscreen(screen, 0);113 } 114 } 115 debug(1000, "out"); 116 } 117 118 void inputboxff(struct skin* screen, struct skin* inputbox )111 if(flag != 1) 112 drawscreen(screen, flag); 113 } 114 } 115 debug(1000, "out"); 116 } 117 118 void inputboxff(struct skin* screen, struct skin* inputbox, int flag) 119 119 { 120 120 debug(1000, "in"); … … 124 124 changeinput(inputbox, ""); 125 125 inputbox->aktpage = insertchar(&inputbox->input, '_', inputbox->aktpage); 126 drawscreen(screen, 0);127 } 128 debug(1000, "out"); 129 } 130 131 void inputboxfr(struct skin* screen, struct skin* inputbox )126 drawscreen(screen, flag); 127 } 128 debug(1000, "out"); 129 } 130 131 void inputboxfr(struct skin* screen, struct skin* inputbox, int flag) 132 132 { 133 133 debug(1000, "in"); … … 135 135 { 136 136 inputbox->aktpage = delchar(&inputbox->input, inputbox->aktpage); 137 drawscreen(screen, 0);137 drawscreen(screen, flag); 138 138 } 139 139 debug(1000, "out"); … … 190 190 } 191 191 192 void inputboxright(struct skin* screen, struct skin* inputbox )192 void inputboxright(struct skin* screen, struct skin* inputbox, int flag) 193 193 { 194 194 debug(1000, "in"); … … 200 200 201 201 checkinputboxnumright(inputbox); 202 drawscreen(screen, 0);203 } 204 debug(1000, "out"); 205 } 206 207 void inputboxleft(struct skin* screen, struct skin* inputbox )202 drawscreen(screen, flag); 203 } 204 debug(1000, "out"); 205 } 206 207 void inputboxleft(struct skin* screen, struct skin* inputbox, int flag) 208 208 { 209 209 debug(1000, "in"); … … 215 215 216 216 checkinputboxnumleft(inputbox); 217 drawscreen(screen, 0);218 } 219 debug(1000, "out"); 220 } 221 222 void inputbox0(struct skin* screen, struct skin* inputbox )217 drawscreen(screen, flag); 218 } 219 debug(1000, "out"); 220 } 221 222 void inputbox0(struct skin* screen, struct skin* inputbox, int flag) 223 223 { 224 224 if(inputbox != NULL && inputbox->input != NULL) … … 229 229 { 230 230 if(inputbox->input[aktpage] == '0') 231 inputboxchar(screen, inputbox, ' ', 0);231 inputboxchar(screen, inputbox, ' ', flag); 232 232 else if(inputbox->input[aktpage] == ' ') 233 inputboxchar(screen, inputbox, '#', 0);233 inputboxchar(screen, inputbox, '#', flag); 234 234 else if(inputbox->input[aktpage] == '#') 235 inputboxchar(screen, inputbox, '*', 0);235 inputboxchar(screen, inputbox, '*', flag); 236 236 else if(inputbox->input[aktpage] == '*') 237 inputboxchar(screen, inputbox, '_', 0);237 inputboxchar(screen, inputbox, '_', flag); 238 238 else 239 inputboxchar(screen, inputbox, '0', 0);239 inputboxchar(screen, inputbox, '0', flag); 240 240 } 241 241 else 242 242 { 243 243 inputboxchar(screen, inputbox, '0', 1); 244 inputboxright(screen, inputbox );245 } 246 } 247 } 248 249 void inputbox1(struct skin* screen, struct skin* inputbox )244 inputboxright(screen, inputbox, flag); 245 } 246 } 247 } 248 249 void inputbox1(struct skin* screen, struct skin* inputbox, int flag) 250 250 { 251 251 if(inputbox != NULL && inputbox->input != NULL) … … 256 256 { 257 257 if(inputbox->input[aktpage] == '1') 258 inputboxchar(screen, inputbox, '.', 0);258 inputboxchar(screen, inputbox, '.', flag); 259 259 else if(inputbox->input[aktpage] == '.') 260 inputboxchar(screen, inputbox, ',', 0);260 inputboxchar(screen, inputbox, ',', flag); 261 261 else if(inputbox->input[aktpage] == ',') 262 inputboxchar(screen, inputbox, '?', 0);262 inputboxchar(screen, inputbox, '?', flag); 263 263 else if(inputbox->input[aktpage] == '?') 264 inputboxchar(screen, inputbox, '!', 0);264 inputboxchar(screen, inputbox, '!', flag); 265 265 else if(inputbox->input[aktpage] == '!') 266 inputboxchar(screen, inputbox, '\'', 0);266 inputboxchar(screen, inputbox, '\'', flag); 267 267 else if(inputbox->input[aktpage] == '\'') 268 inputboxchar(screen, inputbox, '-', 0);268 inputboxchar(screen, inputbox, '-', flag); 269 269 else if(inputbox->input[aktpage] == '-') 270 inputboxchar(screen, inputbox, '(', 0);270 inputboxchar(screen, inputbox, '(', flag); 271 271 else if(inputbox->input[aktpage] == '(') 272 inputboxchar(screen, inputbox, ')', 0);272 inputboxchar(screen, inputbox, ')', flag); 273 273 else if(inputbox->input[aktpage] == ')') 274 inputboxchar(screen, inputbox, '@', 0);274 inputboxchar(screen, inputbox, '@', flag); 275 275 else if(inputbox->input[aktpage] == '@') 276 inputboxchar(screen, inputbox, '/', 0);276 inputboxchar(screen, inputbox, '/', flag); 277 277 else if(inputbox->input[aktpage] == '/') 278 inputboxchar(screen, inputbox, ':', 0);278 inputboxchar(screen, inputbox, ':', flag); 279 279 else 280 inputboxchar(screen, inputbox, '1', 0);280 inputboxchar(screen, inputbox, '1', flag); 281 281 } 282 282 else 283 283 { 284 284 inputboxchar(screen, inputbox, '1', 1); 285 inputboxright(screen, inputbox );286 } 287 } 288 } 289 290 void inputbox2(struct skin* screen, struct skin* inputbox )285 inputboxright(screen, inputbox, flag); 286 } 287 } 288 } 289 290 void inputbox2(struct skin* screen, struct skin* inputbox, int flag) 291 291 { 292 292 if(inputbox != NULL && inputbox->input != NULL) … … 297 297 { 298 298 if(inputbox->input[aktpage] == '2') 299 inputboxchar(screen, inputbox, 'a', 0);299 inputboxchar(screen, inputbox, 'a', flag); 300 300 else if(inputbox->input[aktpage] == 'a') 301 inputboxchar(screen, inputbox, 'b', 0);301 inputboxchar(screen, inputbox, 'b', flag); 302 302 else if(inputbox->input[aktpage] == 'b') 303 inputboxchar(screen, inputbox, 'c', 0);303 inputboxchar(screen, inputbox, 'c', flag); 304 304 else if(inputbox->input[aktpage] == 'c') 305 inputboxchar(screen, inputbox, 'A', 0);305 inputboxchar(screen, inputbox, 'A', flag); 306 306 else if(inputbox->input[aktpage] == 'A') 307 inputboxchar(screen, inputbox, 'B', 0);307 inputboxchar(screen, inputbox, 'B', flag); 308 308 else if(inputbox->input[aktpage] == 'B') 309 inputboxchar(screen, inputbox, 'C', 0);309 inputboxchar(screen, inputbox, 'C', flag); 310 310 else 311 inputboxchar(screen, inputbox, '2', 0);311 inputboxchar(screen, inputbox, '2', flag); 312 312 } 313 313 else 314 314 { 315 315 inputboxchar(screen, inputbox, '2', 1); 316 inputboxright(screen, inputbox );317 } 318 } 319 } 320 321 void inputbox3(struct skin* screen, struct skin* inputbox )316 inputboxright(screen, inputbox, flag); 317 } 318 } 319 } 320 321 void inputbox3(struct skin* screen, struct skin* inputbox, int flag) 322 322 { 323 323 if(inputbox != NULL && inputbox->input != NULL) … … 328 328 { 329 329 if(inputbox->input[aktpage] == '3') 330 inputboxchar(screen, inputbox, 'd', 0);330 inputboxchar(screen, inputbox, 'd', flag); 331 331 else if(inputbox->input[aktpage] == 'd') 332 inputboxchar(screen, inputbox, 'e', 0);332 inputboxchar(screen, inputbox, 'e', flag); 333 333 else if(inputbox->input[aktpage] == 'e') 334 inputboxchar(screen, inputbox, 'f', 0);334 inputboxchar(screen, inputbox, 'f', flag); 335 335 else if(inputbox->input[aktpage] == 'f') 336 inputboxchar(screen, inputbox, 'D', 0);336 inputboxchar(screen, inputbox, 'D', flag); 337 337 else if(inputbox->input[aktpage] == 'D') 338 inputboxchar(screen, inputbox, 'E', 0);338 inputboxchar(screen, inputbox, 'E', flag); 339 339 else if(inputbox->input[aktpage] == 'E') 340 inputboxchar(screen, inputbox, 'F', 0);340 inputboxchar(screen, inputbox, 'F', flag); 341 341 else 342 inputboxchar(screen, inputbox, '3', 0);342 inputboxchar(screen, inputbox, '3', flag); 343 343 } 344 344 else 345 345 { 346 346 inputboxchar(screen, inputbox, '3', 1); 347 inputboxright(screen, inputbox );348 } 349 } 350 } 351 352 void inputbox4(struct skin* screen, struct skin* inputbox )347 inputboxright(screen, inputbox, flag); 348 } 349 } 350 } 351 352 void inputbox4(struct skin* screen, struct skin* inputbox, int flag) 353 353 { 354 354 if(inputbox != NULL && inputbox->input != NULL) … … 359 359 { 360 360 if(inputbox->input[aktpage] == '4') 361 inputboxchar(screen, inputbox, 'g', 0);361 inputboxchar(screen, inputbox, 'g', flag); 362 362 else if(inputbox->input[aktpage] == 'g') 363 inputboxchar(screen, inputbox, 'h', 0);363 inputboxchar(screen, inputbox, 'h', flag); 364 364 else if(inputbox->input[aktpage] == 'h') 365 inputboxchar(screen, inputbox, 'i', 0);365 inputboxchar(screen, inputbox, 'i', flag); 366 366 else if(inputbox->input[aktpage] == 'i') 367 inputboxchar(screen, inputbox, 'G', 0);367 inputboxchar(screen, inputbox, 'G', flag); 368 368 else if(inputbox->input[aktpage] == 'G') 369 inputboxchar(screen, inputbox, 'H', 0);369 inputboxchar(screen, inputbox, 'H', flag); 370 370 else if(inputbox->input[aktpage] == 'H') 371 inputboxchar(screen, inputbox, 'I', 0);371 inputboxchar(screen, inputbox, 'I', flag); 372 372 else 373 inputboxchar(screen, inputbox, '4', 0);373 inputboxchar(screen, inputbox, '4', flag); 374 374 } 375 375 else 376 376 { 377 377 inputboxchar(screen, inputbox, '4', 1); 378 inputboxright(screen, inputbox );379 } 380 } 381 } 382 383 void inputbox5(struct skin* screen, struct skin* inputbox )378 inputboxright(screen, inputbox, flag); 379 } 380 } 381 } 382 383 void inputbox5(struct skin* screen, struct skin* inputbox, int flag) 384 384 { 385 385 if(inputbox != NULL && inputbox->input != NULL) … … 390 390 { 391 391 if(inputbox->input[aktpage] == '5') 392 inputboxchar(screen, inputbox, 'j', 0);392 inputboxchar(screen, inputbox, 'j', flag); 393 393 else if(inputbox->input[aktpage] == 'j') 394 inputboxchar(screen, inputbox, 'k', 0);394 inputboxchar(screen, inputbox, 'k', flag); 395 395 else if(inputbox->input[aktpage] == 'k') 396 inputboxchar(screen, inputbox, 'l', 0);396 inputboxchar(screen, inputbox, 'l', flag); 397 397 else if(inputbox->input[aktpage] == 'l') 398 inputboxchar(screen, inputbox, 'J', 0);398 inputboxchar(screen, inputbox, 'J', flag); 399 399 else if(inputbox->input[aktpage] == 'J') 400 inputboxchar(screen, inputbox, 'K', 0);400 inputboxchar(screen, inputbox, 'K', flag); 401 401 else if(inputbox->input[aktpage] == 'K') 402 inputboxchar(screen, inputbox, 'L', 0);402 inputboxchar(screen, inputbox, 'L', flag); 403 403 else 404 inputboxchar(screen, inputbox, '5', 0);404 inputboxchar(screen, inputbox, '5', flag); 405 405 } 406 406 else 407 407 { 408 408 inputboxchar(screen, inputbox, '5', 1); 409 inputboxright(screen, inputbox );410 } 411 412 } 413 } 414 415 void inputbox6(struct skin* screen, struct skin* inputbox )409 inputboxright(screen, inputbox, flag); 410 } 411 412 } 413 } 414 415 void inputbox6(struct skin* screen, struct skin* inputbox, int flag) 416 416 { 417 417 if(inputbox != NULL && inputbox->input != NULL) … … 422 422 { 423 423 if(inputbox->input[aktpage] == '6') 424 inputboxchar(screen, inputbox, 'm', 0);424 inputboxchar(screen, inputbox, 'm', flag); 425 425 else if(inputbox->input[aktpage] == 'm') 426 inputboxchar(screen, inputbox, 'n', 0);426 inputboxchar(screen, inputbox, 'n', flag); 427 427 else if(inputbox->input[aktpage] == 'n') 428 inputboxchar(screen, inputbox, 'o', 0);428 inputboxchar(screen, inputbox, 'o', flag); 429 429 else if(inputbox->input[aktpage] == 'o') 430 inputboxchar(screen, inputbox, 'M', 0);430 inputboxchar(screen, inputbox, 'M', flag); 431 431 else if(inputbox->input[aktpage] == 'M') 432 inputboxchar(screen, inputbox, 'N', 0);432 inputboxchar(screen, inputbox, 'N', flag); 433 433 else if(inputbox->input[aktpage] == 'N') 434 inputboxchar(screen, inputbox, 'O', 0);434 inputboxchar(screen, inputbox, 'O', flag); 435 435 else 436 inputboxchar(screen, inputbox, '6', 0);436 inputboxchar(screen, inputbox, '6', flag); 437 437 } 438 438 else 439 439 { 440 440 inputboxchar(screen, inputbox, '6', 1); 441 inputboxright(screen, inputbox );442 } 443 } 444 } 445 446 void inputbox7(struct skin* screen, struct skin* inputbox )441 inputboxright(screen, inputbox, flag); 442 } 443 } 444 } 445 446 void inputbox7(struct skin* screen, struct skin* inputbox, int flag) 447 447 { 448 448 if(inputbox != NULL && inputbox->input != NULL) … … 453 453 { 454 454 if(inputbox->input[aktpage] == '7') 455 inputboxchar(screen, inputbox, 'p', 0);455 inputboxchar(screen, inputbox, 'p', flag); 456 456 else if(inputbox->input[aktpage] == 'p') 457 inputboxchar(screen, inputbox, 'q', 0);457 inputboxchar(screen, inputbox, 'q', flag); 458 458 else if(inputbox->input[aktpage] == 'q') 459 inputboxchar(screen, inputbox, 'r', 0);459 inputboxchar(screen, inputbox, 'r', flag); 460 460 else if(inputbox->input[aktpage] == 'r') 461 inputboxchar(screen, inputbox, 's', 0);461 inputboxchar(screen, inputbox, 's', flag); 462 462 else if(inputbox->input[aktpage] == 's') 463 inputboxchar(screen, inputbox, 'P', 0);463 inputboxchar(screen, inputbox, 'P', flag); 464 464 else if(inputbox->input[aktpage] == 'P') 465 inputboxchar(screen, inputbox, 'Q', 0);465 inputboxchar(screen, inputbox, 'Q', flag); 466 466 else if(inputbox->input[aktpage] == 'Q') 467 inputboxchar(screen, inputbox, 'R', 0);467 inputboxchar(screen, inputbox, 'R', flag); 468 468 else if(inputbox->input[aktpage] == 'R') 469 inputboxchar(screen, inputbox, 'S', 0);469 inputboxchar(screen, inputbox, 'S', flag); 470 470 else 471 inputboxchar(screen, inputbox, '7', 0);471 inputboxchar(screen, inputbox, '7', flag); 472 472 } 473 473 else 474 474 { 475 475 inputboxchar(screen, inputbox, '7', 1); 476 inputboxright(screen, inputbox );477 } 478 } 479 } 480 481 void inputbox8(struct skin* screen, struct skin* inputbox )476 inputboxright(screen, inputbox, flag); 477 } 478 } 479 } 480 481 void inputbox8(struct skin* screen, struct skin* inputbox, int flag) 482 482 { 483 483 if(inputbox != NULL && inputbox->input != NULL) … … 488 488 { 489 489 if(inputbox->input[aktpage] == '8') 490 inputboxchar(screen, inputbox, 't', 0);490 inputboxchar(screen, inputbox, 't', flag); 491 491 else if(inputbox->input[aktpage] == 't') 492 inputboxchar(screen, inputbox, 'u', 0);492 inputboxchar(screen, inputbox, 'u', flag); 493 493 else if(inputbox->input[aktpage] == 'u') 494 inputboxchar(screen, inputbox, 'v', 0);494 inputboxchar(screen, inputbox, 'v', flag); 495 495 else if(inputbox->input[aktpage] == 'v') 496 inputboxchar(screen, inputbox, 'T', 0);496 inputboxchar(screen, inputbox, 'T', flag); 497 497 else if(inputbox->input[aktpage] == 'T') 498 inputboxchar(screen, inputbox, 'U', 0);498 inputboxchar(screen, inputbox, 'U', flag); 499 499 else if(inputbox->input[aktpage] == 'U') 500 inputboxchar(screen, inputbox, 'V', 0);500 inputboxchar(screen, inputbox, 'V', flag); 501 501 else 502 inputboxchar(screen, inputbox, '8', 0);502 inputboxchar(screen, inputbox, '8', flag); 503 503 } 504 504 else 505 505 { 506 506 inputboxchar(screen, inputbox, '8', 1); 507 inputboxright(screen, inputbox );508 } 509 } 510 } 511 512 void inputbox9(struct skin* screen, struct skin* inputbox )507 inputboxright(screen, inputbox, flag); 508 } 509 } 510 } 511 512 void inputbox9(struct skin* screen, struct skin* inputbox, int flag) 513 513 { 514 514 if(inputbox != NULL && inputbox->input != NULL) … … 519 519 { 520 520 if(inputbox->input[aktpage] == '9') 521 inputboxchar(screen, inputbox, 'w', 0);521 inputboxchar(screen, inputbox, 'w', flag); 522 522 else if(inputbox->input[aktpage] == 'w') 523 inputboxchar(screen, inputbox, 'x', 0);523 inputboxchar(screen, inputbox, 'x', flag); 524 524 else if(inputbox->input[aktpage] == 'x') 525 inputboxchar(screen, inputbox, 'y', 0);525 inputboxchar(screen, inputbox, 'y', flag); 526 526 else if(inputbox->input[aktpage] == 'y') 527 inputboxchar(screen, inputbox, 'z', 0);527 inputboxchar(screen, inputbox, 'z', flag); 528 528 else if(inputbox->input[aktpage] == 'z') 529 inputboxchar(screen, inputbox, 'W', 0);529 inputboxchar(screen, inputbox, 'W', flag); 530 530 else if(inputbox->input[aktpage] == 'W') 531 inputboxchar(screen, inputbox, 'X', 0);531 inputboxchar(screen, inputbox, 'X', flag); 532 532 else if(inputbox->input[aktpage] == 'X') 533 inputboxchar(screen, inputbox, 'Y', 0);533 inputboxchar(screen, inputbox, 'Y', flag); 534 534 else if(inputbox->input[aktpage] == 'Y') 535 inputboxchar(screen, inputbox, 'Z', 0);535 inputboxchar(screen, inputbox, 'Z', flag); 536 536 else 537 inputboxchar(screen, inputbox, '9', 0);537 inputboxchar(screen, inputbox, '9', flag); 538 538 } 539 539 else 540 540 { 541 541 inputboxchar(screen, inputbox, '9', 1); 542 inputboxright(screen, inputbox );543 } 544 } 545 } 546 547 void choiceboxleft(struct skin* screen, struct skin* choicebox )542 inputboxright(screen, inputbox, flag); 543 } 544 } 545 } 546 547 void choiceboxleft(struct skin* screen, struct skin* choicebox, int flag) 548 548 { 549 549 debug(1000, "in"); … … 554 554 else 555 555 choicebox->aktpage--; 556 drawscreen(screen, 0);557 } 558 debug(1000, "out"); 559 } 560 561 void choiceboxright(struct skin* screen, struct skin* choicebox )556 drawscreen(screen, flag); 557 } 558 debug(1000, "out"); 559 } 560 561 void choiceboxright(struct skin* screen, struct skin* choicebox, int flag) 562 562 { 563 563 debug(1000, "in"); … … 571 571 choicebox->aktpage++; 572 572 } 573 drawscreen(screen, 0);574 } 575 debug(1000, "out"); 576 } 577 578 void griddown(struct skin* screen, struct skin* grid )573 drawscreen(screen, flag); 574 } 575 debug(1000, "out"); 576 } 577 578 void griddown(struct skin* screen, struct skin* grid, int flag) 579 579 { 580 580 debug(1000, "in"); … … 631 631 632 632 if(grid->select != NULL) delscreenrc(screen, grid->select); 633 drawscreen(screen, 0);634 } 635 636 debug(1000, "out"); 637 } 638 639 void gridup(struct skin* screen, struct skin* grid )633 drawscreen(screen, flag); 634 } 635 636 debug(1000, "out"); 637 } 638 639 void gridup(struct skin* screen, struct skin* grid, int flag) 640 640 { 641 641 debug(1000, "in"); … … 699 699 700 700 if(grid->select != NULL) delscreenrc(screen, grid->select); 701 drawscreen(screen, 0);702 } 703 704 debug(1000, "out"); 705 } 706 707 void gridleft(struct skin* screen, struct skin* grid )701 drawscreen(screen, flag); 702 } 703 704 debug(1000, "out"); 705 } 706 707 void gridleft(struct skin* screen, struct skin* grid, int flag) 708 708 { 709 709 debug(1000, "in"); … … 736 736 737 737 if(grid->select != NULL) delscreenrc(screen, grid->select); 738 drawscreen(screen, 0);738 drawscreen(screen, flag); 739 739 if(grid->select != NULL) 740 740 grid->gridcol = grid->select->posx + (grid->select->width / 2); … … 743 743 } 744 744 745 void gridright(struct skin* screen, struct skin* grid )745 void gridright(struct skin* screen, struct skin* grid, int flag) 746 746 { 747 747 debug(1000, "in"); … … 776 776 777 777 if(grid->select != NULL) delscreenrc(screen, grid->select); 778 drawscreen(screen, 0);778 drawscreen(screen, flag); 779 779 if(grid->select != NULL) 780 780 grid->gridcol = grid->select->posx + (grid->select->width / 2); … … 783 783 } 784 784 785 void gridchup(struct skin* screen, struct skin* grid )785 void gridchup(struct skin* screen, struct skin* grid, int flag) 786 786 { 787 787 debug(1000, "in"); … … 794 794 grid->aktpage = 1; 795 795 796 drawscreen(screen, 0);796 drawscreen(screen, flag); 797 797 if(grid->select != NULL) 798 798 grid->gridcol = grid->select->posx + (grid->select->width / 2); … … 802 802 } 803 803 804 void gridchdown(struct skin* screen, struct skin* grid )804 void gridchdown(struct skin* screen, struct skin* grid, int flag) 805 805 { 806 806 debug(1000, "in"); … … 816 816 } 817 817 818 drawscreen(screen, 0);818 drawscreen(screen, flag); 819 819 if(grid->select != NULL) 820 820 grid->gridcol = grid->select->posx + (grid->select->width / 2); … … 825 825 826 826 827 void listboxleft(struct skin* screen, struct skin* listbox )827 void listboxleft(struct skin* screen, struct skin* listbox, int flag) 828 828 { 829 829 debug(1000, "in"); … … 837 837 838 838 if(listbox->select != NULL) delscreenrc(screen, listbox->select); 839 drawscreen(screen, 0);840 } 841 842 debug(1000, "out"); 843 } 844 845 void listboxright(struct skin* screen, struct skin* listbox )839 drawscreen(screen, flag); 840 } 841 842 debug(1000, "out"); 843 } 844 845 void listboxright(struct skin* screen, struct skin* listbox, int flag) 846 846 { 847 847 debug(1000, "in"); … … 858 858 859 859 if(listbox->select != NULL) delscreenrc(screen, listbox->select); 860 drawscreen(screen, 0);861 } 862 863 debug(1000, "out"); 864 } 865 866 void listboxup(struct skin* screen, struct skin* listbox )860 drawscreen(screen, flag); 861 } 862 863 debug(1000, "out"); 864 } 865 866 void listboxup(struct skin* screen, struct skin* listbox, int flag) 867 867 { 868 868 debug(1000, "in"); … … 876 876 877 877 if(listbox->select != NULL) delscreenrc(screen, listbox->select); 878 drawscreen(screen, 0);879 } 880 debug(1000, "out"); 881 } 882 883 void listboxdown(struct skin* screen, struct skin* listbox )878 drawscreen(screen, flag); 879 } 880 debug(1000, "out"); 881 } 882 883 void listboxdown(struct skin* screen, struct skin* listbox, int flag) 884 884 { 885 885 debug(1000, "in"); … … 894 894 895 895 if(listbox->select != NULL) delscreenrc(screen, listbox->select); 896 drawscreen(screen, 0);897 } 898 debug(1000, "out"); 899 } 900 901 void textboxup(struct skin* screen, struct skin* textbox )896 drawscreen(screen, flag); 897 } 898 debug(1000, "out"); 899 } 900 901 void textboxup(struct skin* screen, struct skin* textbox, int flag) 902 902 { 903 903 debug(1000, "in"); … … 907 907 { 908 908 textbox->aktpage--; 909 drawscreen(screen, 0);910 } 911 } 912 debug(1000, "out"); 913 } 914 915 void textboxdown(struct skin* screen, struct skin* textbox )909 drawscreen(screen, flag); 910 } 911 } 912 debug(1000, "out"); 913 } 914 915 void textboxdown(struct skin* screen, struct skin* textbox, int flag) 916 916 { 917 917 debug(1000, "in"); … … 921 921 { 922 922 textbox->aktpage++; 923 drawscreen(screen, 0);923 drawscreen(screen, flag); 924 924 } 925 925 } -
titan/titan/skin.h
r11088 r11112 676 676 { 677 677 changetitle(newnode, _(ret)); 678 newnode->titlesize = newnode->fontsize + 6;679 678 free(ret); 680 679 } … … 3719 3718 free(node->title); 3720 3719 if(text != NULL) 3720 { 3721 3721 node->title = strdup(text); 3722 node->titlesize = node->fontsize + 6; 3723 } 3722 3724 else 3725 { 3723 3726 node->title = text; 3727 node->titlesize = 0; 3728 } 3724 3729 ret = 0; 3725 3730 } -
titan/titan/struct.h
r11108 r11112 961 961 { 962 962 int key; 963 void (*rcfunc)(struct skin*, struct skin* );963 void (*rcfunc)(struct skin*, struct skin*, int flag); 964 964 struct skin *screen; 965 965 struct skin *screennode; -
titan/titan/textinput.h
r11108 r11112 5 5 { 6 6 debug(1000, "in"); 7 int rcret = -1 ;7 int rcret = -1, tmpscreencalc = 0, fromthread = 0, height = 0; 8 8 struct skin* textinput = getscreen("textinput"); 9 9 struct skin* input = getscreennode(textinput, "input"); 10 char* ret = NULL; 10 struct skin* framebuffer = getscreen("framebuffer"); 11 char* ret = NULL, *bg = NULL; 11 12 12 changeinput(textinput, title); 13 if(pthread_self() != status.mainthread) 14 fromthread = 1; 15 16 changetitle(textinput, title); 17 height = textinput->height; 18 if(title != NULL) 19 textinput->height += textinput->fontsize + 6 + (textinput->bordersize * 2); 13 20 changeinput(input, text); 14 21 15 drawscreen(textinput, 0); 22 if(fromthread == 1) 23 { 24 m_lock(&status.drawingmutex, 0); 25 m_lock(&status.rcmutex, 10); 26 status.screencalc = 2; 27 setnodeattr(textinput, framebuffer); 28 status.screencalc = 0; 29 status.rcowner = textinput; 30 bg = savescreen(textinput); 31 tmpscreencalc = status.screencalc; 32 status.screencalc = 0; 33 drawscreen(textinput, 2); 34 } 35 else 36 drawscreen(textinput, 0); 16 37 addscreenrc(textinput, input); 17 38 … … 28 49 29 50 delownerrc(textinput); 30 clearscreen(textinput);31 drawscreen(skin, 0);32 51 52 if(fromthread == 1) 53 { 54 clearscreennolock(textinput); 55 restorescreen(bg, textinput); 56 blitfb(); 57 status.screencalc = tmpscreencalc; 58 sleep(1); 59 status.rcowner = NULL; 60 m_unlock(&status.rcmutex, 3); 61 m_unlock(&status.drawingmutex, 0); 62 } 63 else 64 { 65 clearscreen(textinput); 66 drawscreen(skin, 0); 67 } 68 69 textinput->height = height; 33 70 debug(1000, "out"); 34 35 71 return ret; 36 72 }
Note: See TracChangeset
for help on using the changeset viewer.