aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty/vt
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2016-06-23 07:34:34 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-06-25 12:04:48 -0400
commitaada0a344182e3aec7bfb0cc611f272e6297c3e3 (patch)
tree45d01424b9144cd33df8b0335c4ae8e923df0b53 /drivers/tty/vt
parent193df0227964a0620267bb0236dfd6463a0ccea0 (diff)
tty: vt, whitespace cleanup in csi_m
Flush the switch cases to be aligned with the switch. Mostly everything can now fit to the 80-chars terminal. Signed-off-by: Jiri Slaby <jslaby@suse.cz> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/vt')
-rw-r--r--drivers/tty/vt/vt.c169
1 files changed, 85 insertions, 84 deletions
diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c
index acecd6662426..8ceabfd20561 100644
--- a/drivers/tty/vt/vt.c
+++ b/drivers/tty/vt/vt.c
@@ -1330,90 +1330,91 @@ static void csi_m(struct vc_data *vc)
1330 1330
1331 for (i = 0; i <= vc->vc_npar; i++) 1331 for (i = 0; i <= vc->vc_npar; i++)
1332 switch (vc->vc_par[i]) { 1332 switch (vc->vc_par[i]) {
1333 case 0: /* all attributes off */ 1333 case 0: /* all attributes off */
1334 default_attr(vc); 1334 default_attr(vc);
1335 break; 1335 break;
1336 case 1: 1336 case 1:
1337 vc->vc_intensity = 2; 1337 vc->vc_intensity = 2;
1338 break; 1338 break;
1339 case 2: 1339 case 2:
1340 vc->vc_intensity = 0; 1340 vc->vc_intensity = 0;
1341 break; 1341 break;
1342 case 3: 1342 case 3:
1343 vc->vc_italic = 1; 1343 vc->vc_italic = 1;
1344 break; 1344 break;
1345 case 4: 1345 case 4:
1346 vc->vc_underline = 1; 1346 vc->vc_underline = 1;
1347 break; 1347 break;
1348 case 5: 1348 case 5:
1349 vc->vc_blink = 1; 1349 vc->vc_blink = 1;
1350 break; 1350 break;
1351 case 7: 1351 case 7:
1352 vc->vc_reverse = 1; 1352 vc->vc_reverse = 1;
1353 break; 1353 break;
1354 case 10: /* ANSI X3.64-1979 (SCO-ish?) 1354 case 10: /* ANSI X3.64-1979 (SCO-ish?)
1355 * Select primary font, don't display 1355 * Select primary font, don't display control chars if
1356 * control chars if defined, don't set 1356 * defined, don't set bit 8 on output.
1357 * bit 8 on output. 1357 */
1358 */ 1358 vc->vc_translate = set_translate(vc->vc_charset == 0
1359 vc->vc_translate = set_translate(vc->vc_charset == 0 1359 ? vc->vc_G0_charset
1360 ? vc->vc_G0_charset 1360 : vc->vc_G1_charset, vc);
1361 : vc->vc_G1_charset, vc); 1361 vc->vc_disp_ctrl = 0;
1362 vc->vc_disp_ctrl = 0; 1362 vc->vc_toggle_meta = 0;
1363 vc->vc_toggle_meta = 0; 1363 break;
1364 break; 1364 case 11: /* ANSI X3.64-1979 (SCO-ish?)
1365 case 11: /* ANSI X3.64-1979 (SCO-ish?) 1365 * Select first alternate font, lets chars < 32 be
1366 * Select first alternate font, lets 1366 * displayed as ROM chars.
1367 * chars < 32 be displayed as ROM chars. 1367 */
1368 */ 1368 vc->vc_translate = set_translate(IBMPC_MAP, vc);
1369 vc->vc_translate = set_translate(IBMPC_MAP, vc); 1369 vc->vc_disp_ctrl = 1;
1370 vc->vc_disp_ctrl = 1; 1370 vc->vc_toggle_meta = 0;
1371 vc->vc_toggle_meta = 0; 1371 break;
1372 break; 1372 case 12: /* ANSI X3.64-1979 (SCO-ish?)
1373 case 12: /* ANSI X3.64-1979 (SCO-ish?) 1373 * Select second alternate font, toggle high bit
1374 * Select second alternate font, toggle 1374 * before displaying as ROM char.
1375 * high bit before displaying as ROM char. 1375 */
1376 */ 1376 vc->vc_translate = set_translate(IBMPC_MAP, vc);
1377 vc->vc_translate = set_translate(IBMPC_MAP, vc); 1377 vc->vc_disp_ctrl = 1;
1378 vc->vc_disp_ctrl = 1; 1378 vc->vc_toggle_meta = 1;
1379 vc->vc_toggle_meta = 1; 1379 break;
1380 break; 1380 case 21:
1381 case 21: 1381 case 22:
1382 case 22: 1382 vc->vc_intensity = 1;
1383 vc->vc_intensity = 1; 1383 break;
1384 break; 1384 case 23:
1385 case 23: 1385 vc->vc_italic = 0;
1386 vc->vc_italic = 0; 1386 break;
1387 break; 1387 case 24:
1388 case 24: 1388 vc->vc_underline = 0;
1389 vc->vc_underline = 0; 1389 break;
1390 break; 1390 case 25:
1391 case 25: 1391 vc->vc_blink = 0;
1392 vc->vc_blink = 0; 1392 break;
1393 break; 1393 case 27:
1394 case 27: 1394 vc->vc_reverse = 0;
1395 vc->vc_reverse = 0; 1395 break;
1396 break; 1396 case 38:
1397 case 38: 1397 i = vc_t416_color(vc, i, rgb_foreground);
1398 i = vc_t416_color(vc, i, rgb_foreground); 1398 break;
1399 break; 1399 case 48:
1400 case 48: 1400 i = vc_t416_color(vc, i, rgb_background);
1401 i = vc_t416_color(vc, i, rgb_background); 1401 break;
1402 break; 1402 case 39:
1403 case 39: 1403 vc->vc_color = (vc->vc_def_color & 0x0f) |
1404 vc->vc_color = (vc->vc_def_color & 0x0f) | (vc->vc_color & 0xf0); 1404 (vc->vc_color & 0xf0);
1405 break; 1405 break;
1406 case 49: 1406 case 49:
1407 vc->vc_color = (vc->vc_def_color & 0xf0) | (vc->vc_color & 0x0f); 1407 vc->vc_color = (vc->vc_def_color & 0xf0) |
1408 break; 1408 (vc->vc_color & 0x0f);
1409 default: 1409 break;
1410 if (vc->vc_par[i] >= 30 && vc->vc_par[i] <= 37) 1410 default:
1411 vc->vc_color = color_table[vc->vc_par[i] - 30] 1411 if (vc->vc_par[i] >= 30 && vc->vc_par[i] <= 37)
1412 | (vc->vc_color & 0xf0); 1412 vc->vc_color = color_table[vc->vc_par[i] - 30]
1413 else if (vc->vc_par[i] >= 40 && vc->vc_par[i] <= 47) 1413 | (vc->vc_color & 0xf0);
1414 vc->vc_color = (color_table[vc->vc_par[i] - 40] << 4) 1414 else if (vc->vc_par[i] >= 40 && vc->vc_par[i] <= 47)
1415 | (vc->vc_color & 0x0f); 1415 vc->vc_color = (color_table[vc->vc_par[i] - 40] << 4)
1416 break; 1416 | (vc->vc_color & 0x0f);
1417 break;
1417 } 1418 }
1418 update_attr(vc); 1419 update_attr(vc);
1419} 1420}
generated by cgit v1.2.2 (git 2.25.0) at 2025-09-03 07:11:08 -0400